From 3779c339750d167f14d240fca29d55d81b698e7e Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 6 Jun 2024 07:25:30 +0000 Subject: [PATCH] PMM-12913 minor syntax fixes --- api/MIGRATION_EXAMPLES.md | 14 ++++++++++++-- build/ansible/roles/nginx/files/conf.d/pmm.conf | 2 +- utils/errors/errors.go | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/api/MIGRATION_EXAMPLES.md b/api/MIGRATION_EXAMPLES.md index b3f1bf2248..e3611729ea 100644 --- a/api/MIGRATION_EXAMPLES.md +++ b/api/MIGRATION_EXAMPLES.md @@ -76,6 +76,9 @@ curl -X GET http://admin:admin@127.0.0.1:8080/v1/backups/bcc83096-b006-4d2e-ac17 ### POST /v1/backup/Backups/GetLogs -> GET /v1/backups/restores/{restore_id}/logs (this is a second endpoint, that accepts artifact_id) curl -X GET http://admin:admin@127.0.0.1:8080/v1/backups/restores/bcc83096-b006-4d2e-ac17-365a57c3e37a/logs +### POST /v1/alerting/Rules/Create -> POST /v1/alerting/rules +curl -X POST -d '{"severity":"SEVERITY_CRITICAL","template_name":"mongodb_down","folder_uid":"fdjhiflcwnytcc","name":"MongoDB Down Alerting Rule","group":"MongoDB"}' http://admin:admin@127.0.0.1:8080/v1/alerting/rules + ### POST /v0/qan/Filters/Get -> POST /v1/qan/metrics:getFilters curl -X POST -d '{"period_start_from": "2024-05-21T06:50:00Z", "period_start_to": "2025-05-28T14:00:00Z"}' http://admin:admin@127.0.0.1:8080/v1/qan/metrics:getFilters @@ -85,5 +88,12 @@ curl -X POST -d '{"filter_by":"-6680645881763619241","group_by":"queryid","label ### POST /v0/qan/GetMetricsNames -> POST /v1/qan/metrics:getNames curl -X POST -d '{}' http://admin:admin@127.0.0.1:8080/v1/qan/metrics:getNames -### POST /v1/alerting/Rules/Create -> POST /v1/alerting/rules -curl -X POST -d '{"severity":"SEVERITY_CRITICAL","template_name":"mongodb_down","folder_uid":"fdjhiflcwnytcc","name":"MongoDB Down Alerting Rule","group":"MongoDB"}' http://admin:admin@127.0.0.1:8080/v1/alerting/rules +### POST /v0/qan/ObjectDetails/GetLables -> POST /v1/qan:getLabels +curl -X POST -d '{"filter_by":"-6680645881763619241","group_by":"queryid","labels":[],"period_start_from":"2024-05-29T23:32:25+03:00","period_start_to":"2024-05-30T11:32:25+03:00","tables":[],"totals":false}' http://admin:admin@127.0.0.1:8080/v1/qan:getLabels + +### POST /v0/qan/ObjectDetails/GetHistogram -> POST /v1/qan:getHistogram +curl -X POST -d '{"queryid": "32b9a8dbf71f9d7b202fe117ebc72ce060bf304b504dbeae74da8782a5d27edf","period_start_from":"2024-05-29T23:32:25+03:00","period_start_to":"2024-05-30T11:32:25+03:00"}' http://admin:admin@127.0.0.1:8080/v1/qan:getHistogram + +### POST /v0/qan/ObjectDetails/ExplainFingerprintByQueryId -> POST /v1/qan:explainFingerprint +curl -X POST -d '{"queryid": "32b9a8dbf71f9d7b202fe117ebc72ce060bf304b504dbeae74da8782a5d27edf","period_start_from":"2024-05-29T23:32:25+03:00","period_start_to":"2024-05-30T11:32:25+03:00"}' http://admin:admin@127.0.0.1:8080/v1/qan:explainFingerprint + diff --git a/build/ansible/roles/nginx/files/conf.d/pmm.conf b/build/ansible/roles/nginx/files/conf.d/pmm.conf index 2f47c2d0ac..ec646a1672 100644 --- a/build/ansible/roles/nginx/files/conf.d/pmm.conf +++ b/build/ansible/roles/nginx/files/conf.d/pmm.conf @@ -236,7 +236,7 @@ # pmm-dump artifacts location /dump { - alias /srv/dump/; + alias /srv/dump/; } # This localtion stores static content for general pmm-server purposes. diff --git a/utils/errors/errors.go b/utils/errors/errors.go index d7e60944e8..76b9e91941 100644 --- a/utils/errors/errors.go +++ b/utils/errors/errors.go @@ -80,7 +80,7 @@ func PMMHTTPErrorHandler(ctx context.Context, mux *runtime.ServeMux, marshaler r md, ok := runtime.ServerMetadataFromContext(ctx) if !ok { - grpclog.Infof("Failed to extract ServerMetadata from context") + grpclog.Info("Failed to extract ServerMetadata from context") } handleForwardResponseServerMetadata(w, mux, md)