Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(metrics): remove deprecated apiserver metrics #2898

Merged
merged 2 commits into from
Feb 28, 2023
Merged

chore(metrics): remove deprecated apiserver metrics #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6e166
ci: count closed PRs when determining the default PR number
Feb 27, 2023
b8636a1
chore(metrics): remove deprecated apiserver metrics
Feb 27, 2023
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
1 change: 1 addition & 0 deletions .changelog/2898.changed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore(metrics): remove deprecated apiserver metrics
2 changes: 1 addition & 1 deletion ci/add-changelog-entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function get_default_pr_number() {
fi

local latest_pr_number
latest_pr_number=$(curl -s "https://api.github.com/repos/SumoLogic/sumologic-kubernetes-collection/issues?per_page=1" | jq '.[0].number')
latest_pr_number=$(curl -s "https://api.github.com/repos/SumoLogic/sumologic-kubernetes-collection/issues?state=all&per_page=1" | jq '.[0].number')
echo "$((latest_pr_number + 1))"
}

Expand Down
17 changes: 4 additions & 13 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,17 +1590,12 @@ kube-prometheus-stack:
## see docs/scraped_metrics.md
## apiserver_request_count
## apiserver_request_total
## apiserver_request_duration_seconds_count
## apiserver_request_duration_seconds_bucket
## apiserver_request_duration_seconds_count
## apiserver_request_duration_seconds_sum
sumo-drosiek marked this conversation as resolved.
Show resolved Hide resolved
## apiserver_request_latencies_count
## apiserver_request_latencies_sum
## apiserver_request_latencies_summary
## apiserver_request_latencies_summary_count
## apiserver_request_latencies_summary_sum
metricRelabelings:
- action: keep
regex: (?:apiserver_request_(?:count|total)|apiserver_request_(?:duration_seconds|latencies)_(?:count|sum)|apiserver_request_latencies_summary(?:|_count|_sum)|apiserver_request_duration_seconds_bucket)
regex: (?:apiserver_request_(?:count|total)|apiserver_request_(?:duration_seconds)_(?:count|sum|bucket))
sourceLabels: [__name__]
kubelet:
serviceMonitor:
Expand Down Expand Up @@ -2127,13 +2122,9 @@ kube-prometheus-stack:
## api server metrics:
## apiserver_request_count
## apiserver_request_total
## apiserver_request_duration_seconds_bucket
## apiserver_request_duration_seconds_count
## apiserver_request_duration_seconds_sum
## apiserver_request_latencies_count
## apiserver_request_latencies_sum
## apiserver_request_latencies_summary
## apiserver_request_latencies_summary_count
## apiserver_request_latencies_summary_sum
## etcd_request_cache_get_duration_seconds_count
## etcd_request_cache_get_duration_seconds_sum
## etcd_request_cache_add_duration_seconds_count
Expand All @@ -2150,7 +2141,7 @@ kube-prometheus-stack:
remoteTimeout: 5s
writeRelabelConfigs:
- action: keep
regex: apiserver;(?:apiserver_request_(?:count|total)|apiserver_request_(?:duration_seconds|latencies)_(?:count|sum)|apiserver_request_latencies_summary(?:|_count|_sum)|etcd_request_cache_(?:add|get)_(?:duration_seconds|latencies_summary)_(?:count|sum)|etcd_helper_cache_(?:hit|miss)_(?:count|total))
regex: apiserver;(?:apiserver_request_(?:count|total)|apiserver_request_(?:duration_seconds)_(?:count|sum|bucket)|etcd_helper_cache_(?:hit|miss)_(?:count|total))
sourceLabels: [job, __name__]
## kubelet metrics:
## kubelet_docker_operations_errors
Expand Down
12 changes: 1 addition & 11 deletions tests/integration/internal/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,7 @@ var (
"apiserver_request_total",
"apiserver_request_duration_seconds_count",
"apiserver_request_duration_seconds_sum",
// We have the following metrics in our values.yaml, but they've been deprecated for a while
// Kubernetes 1.14 deprecation notice:
// https://github.com/kubernetes/kubernetes/blob/8ac5d4d6a92d59bba70844fbd6e5de2383a08c96/CHANGELOG/CHANGELOG-1.14.md#deprecated-metrics
// Kubernetes 1.17 disablement notice:
// https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/CHANGELOG/CHANGELOG-1.17.md#deprecatedchanged-metrics
// TODO: Remove these from values.yaml and replace them with non-deprecated equivalents
// "apiserver_request_latencies_count",
// "apiserver_request_latencies_sum",
// "apiserver_request_latencies_summary",
// "apiserver_request_latencies_summary_count",
// "apiserver_request_latencies_summary_sum",
"apiserver_request_duration_seconds_bucket",
}
KubeEtcdMetrics = []string{
// Deprecated in etcd v3: https://github.com/kubernetes/kubernetes/pull/79520
Expand Down