Merge pull request #764 from solarwinds/NH-67059_etcd-metrics

NH-67059 add etcd metrics
solarwinds · Oct 24, 2024 · 7812b3a · 7812b3a
2 parents ed03112 + 04ef9d6
commit 7812b3a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/deploy/helm/CHANGELOG.md b/deploy/helm/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [4.2.0-alpha.5] - 2024-10-23
+
+### Added
+
+- Added metrics for Etcd
+
+
 ## [4.1.0] - 2024-09-30
 
 ### Added

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 4.2.0-alpha.4
+version: 4.2.0-alpha.5
 appVersion: 0.11.7
 description: SolarWinds Kubernetes Integration
 keywords:

diff --git a/deploy/helm/node-collector-config.yaml b/deploy/helm/node-collector-config.yaml
@@ -305,7 +305,7 @@ processors:
   filter/histograms:
     metrics:
       metric:
-        - 'type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds" or name == "k8s.workqueue_queue_duration_seconds")'
+        - 'type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds" or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds" or name == "k8s.etcd_disk_backend_commit_duration_seconds")'
 
   transform/istio-metrics:
     metric_statements:

diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap
@@ -165,7 +165,8 @@ Node collector config for windows nodes should match snapshot when using default
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/receiver:
           metrics:
             metric:
@@ -1282,7 +1283,8 @@ Node collector config for windows nodes should match snapshot when using legacy
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/logs:
           logs:
             include:

diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap
@@ -165,7 +165,8 @@ Custom logs filter with new syntax:
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/logs:
           logs:
             log_record:
@@ -1315,7 +1316,8 @@ Custom logs filter with old syntax:
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/logs:
           logs:
             include:
@@ -2549,7 +2551,8 @@ Node collector config should match snapshot when autodiscovery is disabled:
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/receiver:
           metrics:
             metric:
@@ -3630,7 +3633,8 @@ Node collector config should match snapshot when fargate is enabled:
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/receiver:
           metrics:
             metric:
@@ -4706,7 +4710,8 @@ Node collector config should match snapshot when fargate is enabled and autodisc
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/receiver:
           metrics:
             metric:
@@ -5718,7 +5723,8 @@ Node collector config should match snapshot when using default values:
           metrics:
             metric:
             - type == METRIC_DATA_TYPE_HISTOGRAM and not(name == "k8s.rest_client_request_duration_seconds"
-              or name == "k8s.workqueue_queue_duration_seconds")
+              or name == "k8s.workqueue_queue_duration_seconds" or name == "k8s.etcd_disk_wal_fsync_duration_seconds"
+              or name == "k8s.etcd_disk_backend_commit_duration_seconds")
         filter/receiver:
           metrics:
             metric: