From 36e4c459df19126b55d75809ce1a6daedc75623b Mon Sep 17 00:00:00 2001 From: Leonhardt Wille Date: Mon, 8 Jul 2024 14:52:04 +0200 Subject: [PATCH 1/3] [fix] charts/gundeck: reference correct value for tlsCa (#4127) related to WPB-9960 --- charts/gundeck/templates/redis-ca-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gundeck/templates/redis-ca-secret.yaml b/charts/gundeck/templates/redis-ca-secret.yaml index 84c6aa59128..de1f752e55a 100644 --- a/charts/gundeck/templates/redis-ca-secret.yaml +++ b/charts/gundeck/templates/redis-ca-secret.yaml @@ -11,7 +11,7 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - ca.pem: {{ .Values.redis.tlsCa | b64enc | quote }} + ca.pem: {{ .Values.config.redis.tlsCa | b64enc | quote }} {{- end }} --- {{- if not (empty .Values.config.redis.additionalTlsCa) }} @@ -26,5 +26,5 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - ca.pem: {{ .Values.redis.additionalTlsCa | b64enc | quote }} + ca.pem: {{ .Values.config.redis.additionalTlsCa | b64enc | quote }} {{- end }} From 153047dc54ebc8950cee0ec3e65e410a969b188a Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 9 Jul 2024 17:10:28 +0200 Subject: [PATCH 2/3] Fix names of metrics so they do not contain any dots (#4134) --- changelog.d/3-bug-fixes/metric-names | 1 + libs/metrics-core/src/Data/Metrics/AWS.hs | 2 +- .../src/Network/Wai/Utilities/Server.hs | 4 ++-- services/brig/src/Brig/API/User.hs | 4 ++-- services/brig/src/Brig/Data/Client.hs | 6 +++--- services/brig/src/Brig/User/Auth/Cookie.hs | 2 +- services/brig/src/Brig/User/Search/Index.hs | 16 ++++++++-------- services/cannon/src/Cannon/Run.hs | 2 +- services/cargohold/src/CargoHold/Metrics.hs | 4 ++-- services/galley/src/Galley/Run.hs | 2 +- services/gundeck/src/Gundeck/Push/Native.hs | 12 ++++++------ services/gundeck/src/Gundeck/Push/Websocket.hs | 2 +- .../gundeck/src/Gundeck/ThreadBudget/Internal.hs | 10 +++++----- 13 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 changelog.d/3-bug-fixes/metric-names diff --git a/changelog.d/3-bug-fixes/metric-names b/changelog.d/3-bug-fixes/metric-names new file mode 100644 index 00000000000..27a33ddd12b --- /dev/null +++ b/changelog.d/3-bug-fixes/metric-names @@ -0,0 +1 @@ +Fix names of metrics so they do not contain any dots \ No newline at end of file diff --git a/libs/metrics-core/src/Data/Metrics/AWS.hs b/libs/metrics-core/src/Data/Metrics/AWS.hs index 437ad2f0628..d70ac4d7986 100644 --- a/libs/metrics-core/src/Data/Metrics/AWS.hs +++ b/libs/metrics-core/src/Data/Metrics/AWS.hs @@ -34,6 +34,6 @@ awsAuthTokenSecsRemaining = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "aws_auth.token_secs_remaining", + { Prom.metricName = "aws_auth_token_secs_remaining", Prom.metricHelp = "Number of seconds left before AWS Auth expires" } diff --git a/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs b/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs index 04a1f17c873..55cc81dfe49 100644 --- a/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs +++ b/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs @@ -126,7 +126,7 @@ netConnections = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "net.connections", + { Prom.metricName = "net_connections", Prom.metricHelp = "Number of active connections" } @@ -412,7 +412,7 @@ netErrors = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "net.errors", + { Prom.metricName = "net_errors", Prom.metricHelp = "Number of exceptions caught by catchErrors middleware" } diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs index 0e820430a54..da5333d7088 100644 --- a/services/brig/src/Brig/API/User.hs +++ b/services/brig/src/Brig/API/User.hs @@ -1141,7 +1141,7 @@ enqueueMultiDeleteCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.enqueue_multi_delete_total", + { Prom.metricName = "user_enqueue_multi_delete_total", Prom.metricHelp = "Number of users enqueued to be deleted" } @@ -1151,7 +1151,7 @@ enqueueMultiDeleteCallsCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.enqueue_multi_delete_calls_total", + { Prom.metricName = "user_enqueue_multi_delete_calls_total", Prom.metricHelp = "Number of users enqueued to be deleted" } diff --git a/services/brig/src/Brig/Data/Client.hs b/services/brig/src/Brig/Data/Client.hs index 946d58577b3..ef2909b35d9 100644 --- a/services/brig/src/Brig/Data/Client.hs +++ b/services/brig/src/Brig/Data/Client.hs @@ -592,7 +592,7 @@ optimisticLockGrabAttemptFailedCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "client.opt_lock.optimistic_lock_grab_attempt_failed", + { Prom.metricName = "client_opt_lock_optimistic_lock_grab_attempt_failed", Prom.metricHelp = "Number of times grab attempts for optimisitic lock on prekeys failed" } @@ -602,7 +602,7 @@ optimisticLockFailedCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "client.opt_lock.optimistic_lock_failed", + { Prom.metricName = "client_opt_lock_optimistic_lock_failed", Prom.metricHelp = "Number of time optimisitic lock on prekeys failed" } @@ -612,6 +612,6 @@ dynProvisionedThroughputExceededCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "client.opt_lock.provisioned_throughput_exceeded", + { Prom.metricName = "client_opt_lock_provisioned_throughput_exceeded", Prom.metricHelp = "Number of times provisioned throughput on DynamoDB was exceeded" } diff --git a/services/brig/src/Brig/User/Auth/Cookie.hs b/services/brig/src/Brig/User/Auth/Cookie.hs index 1be8ff2c778..e1204c43bfd 100644 --- a/services/brig/src/Brig/User/Auth/Cookie.hs +++ b/services/brig/src/Brig/User/Auth/Cookie.hs @@ -306,6 +306,6 @@ cookieSupersededCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.auth.cookie.superseded", + { Prom.metricName = "user_auth_cookie_superseded", Prom.metricHelp = "Number of times user's cookie got superseded" } diff --git a/services/brig/src/Brig/User/Search/Index.hs b/services/brig/src/Brig/User/Search/Index.hs index 24be42ce4ed..7f687369486 100644 --- a/services/brig/src/Brig/User/Search/Index.hs +++ b/services/brig/src/Brig/User/Search/Index.hs @@ -976,7 +976,7 @@ indexUpdateCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.count", + { Prom.metricName = "user_index_update_count", Prom.metricHelp = "Number of updates on user index" } @@ -986,7 +986,7 @@ indexUpdateErrorCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.err", + { Prom.metricName = "user_index_update_err", Prom.metricHelp = "Number of errors during user index update" } @@ -996,7 +996,7 @@ indexUpdateSuccessCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.ok", + { Prom.metricName = "user_index_update_ok", Prom.metricHelp = "Number of successful user index updates" } @@ -1006,7 +1006,7 @@ indexBulkUpdateCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.bulk.count", + { Prom.metricName = "user_index_update_bulk_count", Prom.metricHelp = "Number of bulk updates on user index" } @@ -1016,7 +1016,7 @@ indexBulkUpdateErrorCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.bulk.err", + { Prom.metricName = "user_index_update_bulk_err", Prom.metricHelp = "Number of errors during bulk updates on user index" } @@ -1026,7 +1026,7 @@ indexBulkUpdateSuccessCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.bulk.ok", + { Prom.metricName = "user_index_update_bulk_ok", Prom.metricHelp = "Number of successful bulk updates on user index" } @@ -1037,7 +1037,7 @@ indexBulkUpdateResponseCounter = Prom.vector ("status") $ Prom.counter Prom.Info - { Prom.metricName = "user.index.update.bulk.response", + { Prom.metricName = "user_index_update_bulk_response", Prom.metricHelp = "Number of successful bulk updates on user index" } @@ -1047,6 +1047,6 @@ indexDeleteCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "user.index.delete.count", + { Prom.metricName = "user_index_delete_count", Prom.metricHelp = "Number of deletes on user index" } diff --git a/services/cannon/src/Cannon/Run.hs b/services/cannon/src/Cannon/Run.hs index ba8256cb62b..05984cedcb1 100644 --- a/services/cannon/src/Cannon/Run.hs +++ b/services/cannon/src/Cannon/Run.hs @@ -151,6 +151,6 @@ websocketClientsGauge = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "net.websocket.clients", + { Prom.metricName = "net_websocket_clients", Prom.metricHelp = "Number of connected websocket clients" } diff --git a/services/cargohold/src/CargoHold/Metrics.hs b/services/cargohold/src/CargoHold/Metrics.hs index af9dab18a93..5d76beb2dbb 100644 --- a/services/cargohold/src/CargoHold/Metrics.hs +++ b/services/cargohold/src/CargoHold/Metrics.hs @@ -29,7 +29,7 @@ netS3UploadOk = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "net.s3.upload_ok", + { Prom.metricName = "net_s3_upload_ok", Prom.metricHelp = "Number of successful S3 Uploads" } @@ -43,6 +43,6 @@ netS3UploadSize = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "net.s3.upload_size", + { Prom.metricName = "net_s3_upload_size", Prom.metricHelp = "Number of bytes uploaded successfully uploaded to S3" } diff --git a/services/galley/src/Galley/Run.hs b/services/galley/src/Galley/Run.hs index 4ac4bc764ca..7d78fdcdbdf 100644 --- a/services/galley/src/Galley/Run.hs +++ b/services/galley/src/Galley/Run.hs @@ -188,7 +188,7 @@ deleteQueueLengthGauge = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "galley.deletequeue.len", + { Prom.metricName = "galley_deletequeue_len", Prom.metricHelp = "Length of the galley delete queue" } diff --git a/services/gundeck/src/Gundeck/Push/Native.hs b/services/gundeck/src/Gundeck/Push/Native.hs index 917960c4e7e..0b9c6660eb4 100644 --- a/services/gundeck/src/Gundeck/Push/Native.hs +++ b/services/gundeck/src/Gundeck/Push/Native.hs @@ -66,7 +66,7 @@ nativePushSuccessCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.success", + { Prom.metricName = "push_native_success", Prom.metricHelp = "Number of times native pushes were successfully pushed" } @@ -76,7 +76,7 @@ nativePushDisabledCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.disabled", + { Prom.metricName = "push_native_disabled", Prom.metricHelp = "Number of times native pushes were not pushed due to a disabled endpoint" } @@ -86,7 +86,7 @@ nativePushInvalidCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.invalid", + { Prom.metricName = "push_native_invalid", Prom.metricHelp = "Number of times native pushes were not pushed due to an invalid endpoint" } @@ -96,7 +96,7 @@ nativePushTooLargeCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.too_large", + { Prom.metricName = "push_native_too_large", Prom.metricHelp = "Number of times native pushes were not pushed due to payload being too large" } @@ -106,7 +106,7 @@ nativePushUnauthorizedCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.unauthorized", + { Prom.metricName = "push_native_unauthorized", Prom.metricHelp = "Number of times native pushes were not pushed due to an unauthorized endpoint" } @@ -116,7 +116,7 @@ nativePushErrorCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.native.errors", + { Prom.metricName = "push_native_errors", Prom.metricHelp = "Number of times native pushes were not pushed due to an unexpected error" } diff --git a/services/gundeck/src/Gundeck/Push/Websocket.hs b/services/gundeck/src/Gundeck/Push/Websocket.hs index a706d6cb5d9..2a6ff64e406 100644 --- a/services/gundeck/src/Gundeck/Push/Websocket.hs +++ b/services/gundeck/src/Gundeck/Push/Websocket.hs @@ -113,7 +113,7 @@ pushWsUnreachableCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "push.ws.unreachable", + { Prom.metricName = "push_ws_unreachable", Prom.metricHelp = "Number of times websocket pushes were not pushed due cannon being unreachable" } diff --git a/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs b/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs index 12f0a36a8dd..89595b9d51b 100644 --- a/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs +++ b/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs @@ -209,7 +209,7 @@ threadBudgetAllocatedGauge = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "net.nativepush.thread_budget_allocated", + { Prom.metricName = "net_nativepush_thread_budget_allocated", Prom.metricHelp = "Number of allocated threads for native pushes" } @@ -219,7 +219,7 @@ threadBudgetHardLimitGauge = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "net.nativepush.thread_budget_hard_limit", + { Prom.metricName = "net_nativepush_thread_budget_hard_limit", Prom.metricHelp = "Hard limit for threads for native pushes" } @@ -229,7 +229,7 @@ threadBudgetSoftLimitGauge = Prom.unsafeRegister $ Prom.gauge Prom.Info - { Prom.metricName = "net.nativepush.thread_budget_soft_limit", + { Prom.metricName = "net_nativepush_thread_budget_soft_limit", Prom.metricHelp = "Soft limit for threads for native pushes" } @@ -239,7 +239,7 @@ threadBudgetHardLimitBreachedCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "net.nativepush.thread_budget_hard_limit_breached", + { Prom.metricName = "net_nativepush_thread_budget_hard_limit_breached", Prom.metricHelp = "Number of times hard limit for threads for native pushes was breached" } @@ -249,7 +249,7 @@ threadBudgetSoftLimitBreachedCounter = Prom.unsafeRegister $ Prom.counter Prom.Info - { Prom.metricName = "net.nativepush.thread_budget_soft_limit_breached", + { Prom.metricName = "net_nativepush_thread_budget_soft_limit_breached", Prom.metricHelp = "Number of times soft limit for threads for native pushes was breached" } From 5cecea367144755780d127f02d67ecd93cfb2da7 Mon Sep 17 00:00:00 2001 From: Zebot Date: Tue, 9 Jul 2024 15:11:12 +0000 Subject: [PATCH 3/3] Add changelog for Release 2024-07-09 --- CHANGELOG.md | 8 ++++++++ changelog.d/3-bug-fixes/metric-names | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/3-bug-fixes/metric-names diff --git a/CHANGELOG.md b/CHANGELOG.md index 16fbd73b4aa..3de95aec62e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# [2024-07-09] (Chart Release 5.5.0) + +## Bug fixes and other updates + + +* Fix names of metrics so they do not contain any dots (#4134) + + # [2024-07-08] (Chart Release 5.4.0) ## Release notes diff --git a/changelog.d/3-bug-fixes/metric-names b/changelog.d/3-bug-fixes/metric-names deleted file mode 100644 index 27a33ddd12b..00000000000 --- a/changelog.d/3-bug-fixes/metric-names +++ /dev/null @@ -1 +0,0 @@ -Fix names of metrics so they do not contain any dots \ No newline at end of file