Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

PMM-9632 Settings view usage. #1107

Closed
wants to merge 6 commits into from
Closed

PMM-9632 Settings view usage. #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d72d5e
PMM-9632 Changes.
May 6, 2022
a2bca00
Merge branch 'main' into PMM-9632-settings-view
May 6, 2022
5357745
PMM-9632 Map rest of properties.
May 6, 2022
0bd0161
Merge branch 'main' into PMM-9632-settings-view
JiriCtvrtka May 10, 2022
f25d6a4
Merge branch 'main' into PMM-9632-settings-view
JiriCtvrtka May 10, 2022
8d813d7
Merge branch 'main' into PMM-9632-settings-view
May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
github.com/minio/minio-go/v7 v7.0.24
github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472
github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16
github.com/percona/pmm v0.0.0-20220510110703-cd16c3d93199
github.com/percona/pmm v0.0.0-20220506093550-f05ed97ac553
github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0
Expand Down
14 changes: 12 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,18 @@ github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472 h1:Henk
github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472/go.mod h1:WZZ3Hi+lAWCaGWmsrfkkvRQPkIa8n1OZ0s8Su+vbgus=
github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16 h1:0fx16uGtl4MwrBwm9/VSoNEhjL0cXYxS0quEhLthGcc=
github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16/go.mod h1:gFUwaFp6Ugu5qsBwiOVJYbDlzgZ77tmXdXGO7tG5xVI=
github.com/percona/pmm v0.0.0-20220510110703-cd16c3d93199 h1:I4n9DeZypB9AHzejhhsS7koajDYhdkpCN0eNet8mNKw=
github.com/percona/pmm v0.0.0-20220510110703-cd16c3d93199/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/pmm v0.0.0-20220427122756-c52cc545e1f3 h1:6IKHKNDNJADEN/YsvXcUiJ8M75/PW+bJZ3kMb+CL7kM=
github.com/percona/pmm v0.0.0-20220427122756-c52cc545e1f3/go.mod h1:FFbpyZXm+Ilg8M/GewuhdjJhPaW1/v1zjRRerYhCfEA=
github.com/percona/pmm v0.0.0-20220505075843-4c5b747aa417 h1:+up7wp2MPPdIJcdx+OaFZHrW2fm+ujze5bmpHWvUvhk=
github.com/percona/pmm v0.0.0-20220505075843-4c5b747aa417/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/pmm v0.0.0-20220505104330-83c792635dce h1:me65k1BreTI5WfolD5gszKGS2tg/cEkCzH8Zv/u57Zo=
github.com/percona/pmm v0.0.0-20220505104330-83c792635dce/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/pmm v0.0.0-20220505105507-94c4ed2be9d7 h1:UKKNivFd9+7ujnX2WIb/P/y11e69fGdT1XhOvpJROxE=
github.com/percona/pmm v0.0.0-20220505105507-94c4ed2be9d7/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/pmm v0.0.0-20220505112525-0466764e44c5 h1:06AwvvECPSr1M/RZRNxtz0VKfNKJNYjHmq8SpF1xnG4=
github.com/percona/pmm v0.0.0-20220505112525-0466764e44c5/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/pmm v0.0.0-20220506093550-f05ed97ac553 h1:WZ2dFg4joMowSTo8ci3t9snbyJRTJEyU4ESZwzbmMEk=
github.com/percona/pmm v0.0.0-20220506093550-f05ed97ac553/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo=
github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54 h1:aI1emmycDTGWKsBdxFPKZqohfBbK4y2ta9G4+RX7gVg=
github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54/go.mod h1:Y2uXi5QNk71+ceJHuI9poank+0S1kjxd3K105fXKVkg=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
Expand Down
26 changes: 26 additions & 0 deletions services/qan/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ func fillPostgreSQL(mb *qanpb.MetricsBucket, bp *agentpb.MetricsBucket_PostgreSQ
mb.Planid = bp.Planid
mb.QueryPlan = bp.QueryPlan
mb.HistogramItems = convertHistogramItems(bp.HistogramItems)
mb.SettingsItems = convertSettingsItems(bp.SettingsItems)
}

func convertHistogramItems(items []*agentpb.HistogramItem) []string {
Expand All @@ -538,3 +539,28 @@ func convertHistogramItems(items []*agentpb.HistogramItem) []string {

return res
}

func convertSettingsItems(items []*agentpb.SettingsItem) []string {
res := []string{}
for _, v := range items {
item := &qanpb.SettingsItem{
Name: v.Name,
Value: v.Value,
DefaultValue: v.DefaultValue,
Description: v.Description,
Minimum: v.Minimum,
Maximum: v.Maximum,
Options: v.Options,
Restart: v.Restart,
}

json, err := json.Marshal(item)
if err != nil {
continue
}

res = append(res, string(json))
}

return res
}