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

[metricbeat] Add kube_daemonset_status_current_number_scheduled to kubernetes.state_daemonset #37329

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[metricbeat] Add kube_daemonset_status_current_number_scheduled to kubernetes.state_daemonset #37329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b09b8b
[metricbeat] Add kube_daemonset_status_current_number_scheduled to ku…
barkbay Dec 7, 2023
170e70c
Update module/kubernetes/state_daemonset/_meta/data.json
barkbay Dec 7, 2023
434c6b4
Merge remote-tracking branch 'origin/main' into daemonset-include-sch…
barkbay Dec 10, 2023
0c270de
go test --data
barkbay Dec 10, 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
10 changes: 10 additions & 0 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45881,6 +45881,16 @@ type: long
The number of ready replicas per DaemonSet


type: long

--

*`kubernetes.daemonset.replicas.scheduled`*::
+
--
The number of replicas scheduled per DaemonSet


type: long

--
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion metricbeat/module/kubernetes/state_daemonset/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
},
"kubernetes": {
"daemonset": {
"name": "kube-proxy",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
4 changes: 4 additions & 0 deletions metricbeat/module/kubernetes/state_daemonset/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
type: long
description: >
The number of ready replicas per DaemonSet
- name: scheduled
type: long
description: >
The number of replicas scheduled per DaemonSet
- name: unavailable
type: long
description: >
Expand Down
9 changes: 6 additions & 3 deletions metricbeat/module/kubernetes/state_daemonset/_meta/test/ksm.v2.10.0.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -30,11 +31,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kindnet",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -55,11 +57,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kube-proxy",
"name": "kindnet",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
9 changes: 6 additions & 3 deletions metricbeat/module/kubernetes/state_daemonset/_meta/test/ksm.v2.8.2.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -30,11 +31,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kindnet",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -55,11 +57,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kube-proxy",
"name": "kindnet",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
9 changes: 6 additions & 3 deletions metricbeat/module/kubernetes/state_daemonset/_meta/test/ksm.v2.9.2.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -30,11 +31,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kindnet",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -55,11 +57,12 @@
"namespace": "kube-system"
},
"MetricSetFields": {
"name": "kube-proxy",
"name": "kindnet",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/state_daemonset/_meta/testdata/docs.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
},
"kubernetes": {
"daemonset": {
"name": "kube-proxy",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down Expand Up @@ -39,6 +40,7 @@
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -61,11 +63,12 @@
},
"kubernetes": {
"daemonset": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/state_daemonset/_meta/testdata/ksm.v2.10.0.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
},
"kubernetes": {
"daemonset": {
"name": "kube-proxy",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down Expand Up @@ -39,6 +40,7 @@
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -61,11 +63,12 @@
},
"kubernetes": {
"daemonset": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/state_daemonset/_meta/testdata/ksm.v2.8.2.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
},
"kubernetes": {
"daemonset": {
"name": "kube-proxy",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down Expand Up @@ -39,6 +40,7 @@
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -61,11 +63,12 @@
},
"kubernetes": {
"daemonset": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/state_daemonset/_meta/testdata/ksm.v2.9.2.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
},
"kubernetes": {
"daemonset": {
"name": "kube-proxy",
"name": "fluentd-elasticsearch",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down Expand Up @@ -39,6 +40,7 @@
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand All @@ -61,11 +63,12 @@
},
"kubernetes": {
"daemonset": {
"name": "fluentd-elasticsearch",
"name": "kube-proxy",
"replicas": {
"available": 1,
"desired": 1,
"ready": 1,
"scheduled": 1,
"unavailable": 0
}
},
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/kubernetes/state_daemonset/state_daemonset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var mapping = &p.MetricsMapping{
Metrics: map[string]p.MetricMap{
"kube_daemonset_metadata_generation": p.InfoMetric(),
"kube_daemonset_status_number_available": p.Metric("replicas.available"),
"kube_daemonset_status_current_number_scheduled": p.Metric("replicas.scheduled"),
"kube_daemonset_status_desired_number_scheduled": p.Metric("replicas.desired"),
"kube_daemonset_status_number_ready": p.Metric("replicas.ready"),
"kube_daemonset_status_number_unavailable": p.Metric("replicas.unavailable"),
Expand Down