GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-06-04 11:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feat/opamp-logparing

Browse Source
This commit is contained in:
nityanandagohain 2023-03-15 20:36:01 +05:30
commit 1c867d3b4c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/query-service/agentConf/db.go
View File

@ -31,11 +31,11 @@ func (r *Repo) initDB(engine string) error {
}
}
func (r *Repo) GetConfigHistory(ctx context.Context, typ ElementTypeDef) ([]ConfigVersion, error) {
func (r *Repo) GetConfigHistory(ctx context.Context, typ ElementTypeDef, limit int) ([]ConfigVersion, error) {
var c []ConfigVersion
err := r.db.SelectContext(ctx, &c, `SELECT
id,
err := r.db.SelectContext(ctx, &c, fmt.Sprintf(`SELECT
version,
id,
element_type,
COALESCE(created_by, -1) as created_by,
created_at,
@ -45,9 +45,14 @@ func (r *Repo) GetConfigHistory(ctx context.Context, typ ElementTypeDef) ([]Conf
is_valid,
disabled,
deploy_status,
deploy_result
deploy_result,
last_hash,
last_config
FROM agent_config_versions AS v
WHERE element_type = $1`, typ)
WHERE element_type = $1
ORDER BY created_at desc, version desc
limit %v`, limit),
typ)
return c, err
}
@ -57,7 +62,7 @@ func (r *Repo) GetConfigVersion(ctx context.Context, typ ElementTypeDef, v int)
err := r.db.GetContext(ctx, &c, `SELECT
id,
version,
element_type,
element_type,
COALESCE(created_by, -1) as created_by,
created_at,
COALESCE((SELECT NAME FROM users

4
pkg/query-service/agentConf/manager.go
View File

@ -51,8 +51,8 @@ func GetConfigVersion(ctx context.Context, elementType ElementTypeDef, version i
return m.GetConfigVersion(ctx, elementType, version)
}
func GetConfigHistory(ctx context.Context, typ ElementTypeDef) ([]ConfigVersion, error) {
return m.GetConfigHistory(ctx, typ)
func GetConfigHistory(ctx context.Context, typ ElementTypeDef, limit int) ([]ConfigVersion, error) {
return m.GetConfigHistory(ctx, typ, limit)
}
// StartNewVersion launches a new config version for given set of elements