Skip to content

Commit

Permalink
Update DaemonSet updated_number_scheduled metric name to be consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@vishnukarthikl
vishnukarthikl committed Jul 25, 2020
1 parent 4d81218 commit e0f8a63
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/daemonset-metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
| kube_daemonset_status_number_misscheduled | Gauge | `daemonset`=&lt;daemonset-name&gt; <br> `namespace`=&lt;daemonset-namespace&gt; | STABLE |
| 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_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
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestDaemonSetStore(t *testing.T) {
# HELP kube_daemonset_status_number_misscheduled The number of nodes running a daemon pod but are not supposed to.
# 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_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 @@ -63,15 +63,15 @@ func TestDaemonSetStore(t *testing.T) {
# TYPE kube_daemonset_status_number_misscheduled gauge
# TYPE kube_daemonset_status_number_ready gauge
# TYPE kube_daemonset_status_number_unavailable 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
kube_daemonset_status_number_available{daemonset="ds1",namespace="ns1"} 0
kube_daemonset_status_number_misscheduled{daemonset="ds1",namespace="ns1"} 10
kube_daemonset_status_number_ready{daemonset="ds1",namespace="ns1"} 5
kube_daemonset_status_number_unavailable{daemonset="ds1",namespace="ns1"} 0
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 @@ -83,7 +83,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 @@ -119,8 +119,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 @@ -132,7 +132,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 @@ -146,7 +146,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 @@ -185,8 +185,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 @@ -199,7 +199,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 @@ -212,7 +212,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

0 comments on commit e0f8a63

Please # to comment.