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

Introducing Deployment condition status metric in Kubernetes module #35999

Merged
merged 14 commits into from
Jul 6, 2023
Merged

Introducing Deployment condition status metric in Kubernetes module #35999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dc09727
adding deployment condition status
gizas Jul 5, 2023
dc7df0a
adding comments for the condition field
gizas Jul 5, 2023
ac1d127
updating changelog
gizas Jul 5, 2023
6f59712
Update ksm.v2.7.0.plain.expected
gizas Jul 5, 2023
02d101f
Update ksm.v2.6.0.plain.expected
gizas Jul 5, 2023
91cdc3d
Update ksm.v2.5.0.plain.expected
gizas Jul 5, 2023
4478e0c
Update ksm.v2.4.2.plain.expected
gizas Jul 5, 2023
39285a8
updating tests spaces
gizas Jul 5, 2023
7c59449
updating fields for state deployment
gizas Jul 5, 2023
c241465
updating fields for state deployment
gizas Jul 5, 2023
743eb56
fixing identation
gizas Jul 5, 2023
c789e83
Update CHANGELOG.next.asciidoc
gizas Jul 6, 2023
07005c5
Merge branch 'main' of github.com:elastic/beats into deployment_condi…
gizas Jul 6, 2023
b3db4cd
fixing unittests
gizas Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ automatic splitting at root level, if root level element is an array. {pull}3415
- Add new parameter `include_linked_accounts` to enable/disable metrics collection from multiple linked AWS Accounts {pull}35648[35648]
- Migrate Azure Billing, Monitor, and Storage metricsets to the newer SDK. {pull}33585[33585]
- Add support for float64 values parsing for statsd metrics of counter type. {pull}35099[35099]
- Add kubernetes.deployment.status.* fields for Kubernetes module {pull}35999[35999]


*Osquerybeat*

Expand Down
20 changes: 20 additions & 0 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45789,6 +45789,26 @@ type: boolean

--


*`kubernetes.deployment.status.available`*::
+
--
Deployment Available Condition status (true, false or unknown)


type: keyword

--

*`kubernetes.deployment.status.progressing`*::
+
--
Deployment Progresing Condition status (true, false or unknown)

type: keyword

--

[float]
=== replicas

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.

4 changes: 4 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"desired": 1,
"unavailable": 0,
"updated": 1
},
"status": {
"available": "true",
"progressing": "true"
}
},
"namespace": "kube-system"
Expand Down
10 changes: 10 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
type: boolean
description: >
Kubernetes deployment paused status
- name: status
type: group
fields:
- name: available
type: keyword
description: |
Deployment Available Condition status (true, false or unknown)
- name: progressing
type: keyword
description: Deployment Progresing Condition status (true, false or unknown)
- name: replicas
type: group
description: >
Expand Down
14 changes: 13 additions & 1 deletion metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.4.2.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"MetricSetFields": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -33,6 +37,10 @@
"MetricSetFields": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -59,6 +67,10 @@
"MetricSetFields": {
"name": "coredns",
"paused": false,
"status": {
ChrsMark marked this conversation as resolved.
Show resolved Hide resolved
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand All @@ -77,4 +89,4 @@
"Period": 0,
"DisableTimeSeries": false
}
]
]
14 changes: 13 additions & 1 deletion metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.5.0.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"MetricSetFields": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -33,6 +37,10 @@
"MetricSetFields": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -59,6 +67,10 @@
"MetricSetFields": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand All @@ -77,4 +89,4 @@
"Period": 0,
"DisableTimeSeries": false
}
]
]
14 changes: 13 additions & 1 deletion metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.6.0.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"MetricSetFields": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -33,6 +37,10 @@
"MetricSetFields": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -59,6 +67,10 @@
"MetricSetFields": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand All @@ -77,4 +89,4 @@
"Period": 0,
"DisableTimeSeries": false
}
]
]
14 changes: 13 additions & 1 deletion metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.7.0.plain.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"MetricSetFields": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -33,6 +37,10 @@
"MetricSetFields": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand All @@ -59,6 +67,10 @@
"MetricSetFields": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand All @@ -77,4 +89,4 @@
"Period": 0,
"DisableTimeSeries": false
}
]
]
12 changes: 12 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/testdata/docs.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"deployment": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -37,6 +41,10 @@
"deployment": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -65,6 +73,10 @@
"deployment": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand Down
12 changes: 12 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.4.2.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"deployment": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -37,6 +41,10 @@
"deployment": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -65,6 +73,10 @@
"deployment": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand Down
12 changes: 12 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.5.0.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"deployment": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -37,6 +41,10 @@
"deployment": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -65,6 +73,10 @@
"deployment": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand Down
12 changes: 12 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.6.0.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"deployment": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -37,6 +41,10 @@
"deployment": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -65,6 +73,10 @@
"deployment": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand Down
12 changes: 12 additions & 0 deletions metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.7.0.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"deployment": {
"name": "kube-state-metrics",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -37,6 +41,10 @@
"deployment": {
"name": "local-path-provisioner",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 1,
"desired": 1,
Expand Down Expand Up @@ -65,6 +73,10 @@
"deployment": {
"name": "coredns",
"paused": false,
"status": {
"available": "true",
"progressing": "true"
},
"replicas": {
"available": 2,
"desired": 2,
Expand Down