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

Jump to bottom

Update DaemonSet updated_number_scheduled metric name to be consistent #1181

Merged
merged 1 commit into from
Jul 25, 2020
Merged

Update DaemonSet updated_number_scheduled metric name to be consistent #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/daemonset-metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
| kube_daemonset_status_number_ready | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_status_number_unavailable | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_status_observed_generation | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_updated_number_scheduled | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_status_updated_number_scheduled | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_metadata_generation | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| kube_daemonset_labels | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; <br> `label_DAEMONSET_LABEL`=&lt;DAEMONSET_LABEL&gt; | STABLE |
2 changes: 1 addition & 1 deletion internal/store/daemonset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ var (
}),
},
{
Name: "kube_daemonset_updated_number_scheduled",
Name: "kube_daemonset_status_updated_number_scheduled",
Type: metric.Gauge,
Help: "The total number of nodes that are running updated daemon pod",
GenerateFunc: wrapDaemonSetFunc(func(d *v1.DaemonSet) *metric.Family {
Expand Down
24 changes: 12 additions & 12 deletions internal/store/daemonset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestDaemonSetStore(t *testing.T) {
# HELP kube_daemonset_status_number_ready The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready.
# HELP kube_daemonset_status_number_unavailable The number of nodes that should be running the daemon pod and have none of the daemon pod running and available
# HELP kube_daemonset_status_observed_generation The most recent generation observed by the daemon set controller.
# HELP kube_daemonset_updated_number_scheduled The total number of nodes that are running updated daemon pod
# HELP kube_daemonset_status_updated_number_scheduled The total number of nodes that are running updated daemon pod
# TYPE kube_daemonset_labels gauge
# TYPE kube_daemonset_metadata_generation gauge
# TYPE kube_daemonset_status_current_number_scheduled gauge
Expand All @@ -66,7 +66,7 @@ func TestDaemonSetStore(t *testing.T) {
# TYPE kube_daemonset_status_number_ready gauge
# TYPE kube_daemonset_status_number_unavailable gauge
# TYPE kube_daemonset_status_observed_generation gauge
# TYPE kube_daemonset_updated_number_scheduled gauge
# TYPE kube_daemonset_status_updated_number_scheduled gauge
kube_daemonset_metadata_generation{daemonset="ds1",namespace="ns1"} 21
kube_daemonset_status_current_number_scheduled{daemonset="ds1",namespace="ns1"} 15
kube_daemonset_status_desired_number_scheduled{daemonset="ds1",namespace="ns1"} 5
Expand All @@ -75,7 +75,7 @@ func TestDaemonSetStore(t *testing.T) {
kube_daemonset_status_number_ready{daemonset="ds1",namespace="ns1"} 5
kube_daemonset_status_number_unavailable{daemonset="ds1",namespace="ns1"} 0
kube_daemonset_status_observed_generation{daemonset="ds1",namespace="ns1"} 2
kube_daemonset_updated_number_scheduled{daemonset="ds1",namespace="ns1"} 0
kube_daemonset_status_updated_number_scheduled{daemonset="ds1",namespace="ns1"} 0
kube_daemonset_labels{daemonset="ds1",label_app="example1",namespace="ns1"} 1
`,
MetricNames: []string{
Expand All @@ -88,7 +88,7 @@ func TestDaemonSetStore(t *testing.T) {
"kube_daemonset_status_number_ready",
"kube_daemonset_status_number_unavailable",
"kube_daemonset_status_observed_generation",
"kube_daemonset_updated_number_scheduled",
"kube_daemonset_status_updated_number_scheduled",
},
},
{
Expand Down Expand Up @@ -124,8 +124,8 @@ func TestDaemonSetStore(t *testing.T) {
# TYPE kube_daemonset_status_number_ready gauge
# HELP kube_daemonset_status_number_unavailable The number of nodes that should be running the daemon pod and have none of the daemon pod running and available
# TYPE kube_daemonset_status_number_unavailable gauge
# HELP kube_daemonset_updated_number_scheduled The total number of nodes that are running updated daemon pod
# TYPE kube_daemonset_updated_number_scheduled gauge
# HELP kube_daemonset_status_updated_number_scheduled The total number of nodes that are running updated daemon pod
# TYPE kube_daemonset_status_updated_number_scheduled gauge
# HELP kube_daemonset_metadata_generation Sequence number representing a specific generation of the desired state.
# TYPE kube_daemonset_metadata_generation gauge
# HELP kube_daemonset_labels Kubernetes labels converted to Prometheus labels.
Expand All @@ -137,7 +137,7 @@ func TestDaemonSetStore(t *testing.T) {
kube_daemonset_status_number_misscheduled{daemonset="ds2",namespace="ns2"} 5
kube_daemonset_status_number_ready{daemonset="ds2",namespace="ns2"} 0
kube_daemonset_status_number_unavailable{daemonset="ds2",namespace="ns2"} 0
kube_daemonset_updated_number_scheduled{daemonset="ds2",namespace="ns2"} 0
kube_daemonset_status_updated_number_scheduled{daemonset="ds2",namespace="ns2"} 0
kube_daemonset_labels{daemonset="ds2",label_app="example2",namespace="ns2"} 1
kube_daemonset_created{namespace="ns2",daemonset="ds2"} 1.5e+09
`,
Expand All @@ -151,7 +151,7 @@ func TestDaemonSetStore(t *testing.T) {
"kube_daemonset_status_number_misscheduled",
"kube_daemonset_status_number_ready",
"kube_daemonset_status_number_unavailable",
"kube_daemonset_updated_number_scheduled",
"kube_daemonset_status_updated_number_scheduled",
},
},
{
Expand Down Expand Up @@ -190,8 +190,8 @@ func TestDaemonSetStore(t *testing.T) {
# TYPE kube_daemonset_status_number_ready gauge
# HELP kube_daemonset_status_number_unavailable The number of nodes that should be running the daemon pod and have none of the daemon pod running and available
# TYPE kube_daemonset_status_number_unavailable gauge
# HELP kube_daemonset_updated_number_scheduled The total number of nodes that are running updated daemon pod
# TYPE kube_daemonset_updated_number_scheduled gauge
# HELP kube_daemonset_status_updated_number_scheduled The total number of nodes that are running updated daemon pod
# TYPE kube_daemonset_status_updated_number_scheduled gauge
# HELP kube_daemonset_metadata_generation Sequence number representing a specific generation of the desired state.
# TYPE kube_daemonset_metadata_generation gauge
# HELP kube_daemonset_labels Kubernetes labels converted to Prometheus labels.
Expand All @@ -204,7 +204,7 @@ func TestDaemonSetStore(t *testing.T) {
kube_daemonset_status_number_misscheduled{daemonset="ds3",namespace="ns3"} 5
kube_daemonset_status_number_ready{daemonset="ds3",namespace="ns3"} 5
kube_daemonset_status_number_unavailable{daemonset="ds3",namespace="ns3"} 5
kube_daemonset_updated_number_scheduled{daemonset="ds3",namespace="ns3"} 5
kube_daemonset_status_updated_number_scheduled{daemonset="ds3",namespace="ns3"} 5
kube_daemonset_labels{daemonset="ds3",label_app="example3",namespace="ns3"} 1
`,
MetricNames: []string{
Expand All @@ -217,7 +217,7 @@ func TestDaemonSetStore(t *testing.T) {
"kube_daemonset_status_number_misscheduled",
"kube_daemonset_status_number_ready",
"kube_daemonset_status_number_unavailable",
"kube_daemonset_updated_number_scheduled",
"kube_daemonset_status_updated_number_scheduled",
},
},
}
Expand Down