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.

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

Modify regexes to match both deprecated and new metrics in 1.16 #372

Merged
merged 3 commits into from Jan 22, 2020

Conversation

maimaisie
Copy link
Contributor

@maimaisie maimaisie commented Jan 17, 2020

Description

Deprecated apiserver metrics:
apiserver_request_count -> apiserver_request_total
apiserver_request_latencies_summary -> apiserver_request_duration_seconds
etcd_request_cache_get_latencies_summary -> etcd_request_cache_get_duration_seconds
etcd_request_cache_add_latencies_summary -> etcd_request_cache_add_duration_seconds
etcd_helper_cache_hit_count -> etcd_helper_cache_hit_total
etcd_helper_cache_miss_count -> etcd_helper_cache_miss_total

(Verified the apiserver metrics are coming in 1.16, but the etcd ones are not, I think all of these 4 etcd metrics got removed in 1.17 but not sure why they are not showing up in 1.16 either)

Deprecated kubelet metrics:
kubelet_runtime_operations_latency_microseconds -> kubelet_runtime_operations_duration_seconds
kubelet_docker_operations_latency_microseconds -> kubelet_docker_operations_duration_seconds
kubelet_docker_operations_errors -> kubelet_docker_operations_errors_total

(Verified all of the old and new kubelet metrics are coming in 1.16)

Testing performed
  • ci/build.sh
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

Copy link
Contributor

@frankreno frankreno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -74,13 +74,13 @@ prometheus:
- url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.apiserver
writeRelabelConfigs:
- action: keep
regex: apiserver;(?:apiserver_request_count|apiserver_request_latencies.*|etcd_request_cache_get_latencies_summary.*|etcd_request_cache_add_latencies_summary.*|etcd_helper_cache_hit_count|etcd_helper_cache_miss_count)
regex: apiserver;(?:apiserver_request_(?:count|total)|apiserver_request_(?:latencies|duration_seconds).*|etcd_request_cache_get_(?:latencies_summary|duration_seconds).*|etcd_request_cache_add_(?:latencies_summary|duration_seconds).*|etcd_helper_cache_hit_(?:count|total)|etcd_helper_cache_miss_(?:count|total))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the etcd metrics here be latency_seconds not duration_seconds?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same with apiserver_request_duration_seconds, should this be apiserver_request_latency_seconds? based on your description

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah I should change the description. they changed latency to duration in those metrics between 1.14 and 1.16

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the confirmation!

@maimaisie maimaisie merged commit 26dc06b into master Jan 22, 2020
@maimaisie maimaisie deleted the maisie-metric-renames branch January 22, 2020 19:56
@lei-sumo
Copy link
Contributor

Is the change done in the way that will support older k8s version as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants