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

feat: add istio citadel_server_cert_chain_expiry_timestamp metric #17268

Merged
merged 5 commits into from
Mar 27, 2024
+11 −1
Merged

feat: add istio citadel_server_cert_chain_expiry_timestamp metric #17268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5257499
feat: add istio citadel_server_cert_chain_expiry_timestamp metric
jwillker Mar 24, 2024
5afa501
Merge branch 'master' into feat/istio-citadel-metrics
jwillker Mar 25, 2024
0695441
update the tests and metadata
FlorentClarret Mar 27, 2024
d330b0f
update changelog
FlorentClarret Mar 27, 2024
12ae791
e2e tests
FlorentClarret Mar 27, 2024
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
1 change: 1 addition & 0 deletions istio/changelog.d/17268.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add the citadel_server_cert_chain_expiry_timestamp metric
2 changes: 2 additions & 0 deletions istio/datadog_checks/istio/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
'citadel_server_csr_count': 'server.csr_count',
'citadel_server_csr_parsing_err_count': 'server.csr_parsing_err_count',
'citadel_server_id_extraction_err_count': 'server.id_extraction_err_count',
'citadel_server_cert_chain_expiry_timestamp': 'server.cert_chain_expiry_timestamp',
'citadel_server_success_cert_issuance_count': 'server.success_cert_issuance_count',
'citadel_server_root_cert_expiry_timestamp': 'server.root_cert_expiry_timestamp',
}
Expand Down Expand Up @@ -379,6 +380,7 @@
'citadel_server_csr_count': 'citadel.server.csr_count',
'citadel_server_csr_parsing_err_count': 'citadel.server.csr_parsing_err_count',
'citadel_server_id_extraction_err_count': 'citadel.server.id_extraction_err_count',
'citadel_server_cert_chain_expiry_timestamp': 'citadel.server.cert_chain_expiry_timestamp',
'citadel_server_success_cert_issuance_count': 'citadel.server.success_cert_issuance_count',
# These metrics supported Istio 1.5
'galley_validation_config_update_error': 'galley.validation.config_update_error',
Expand Down
1 change: 1 addition & 0 deletions istio/metadata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ istio.citadel.process.resident_memory_bytes,gauge,,byte,,[OpenMetrics V1 and V2]
istio.citadel.process.start_time_seconds,gauge,,second,,[OpenMetrics V1 and V2] Start time of the process since unix epoch in seconds.,0,istio,,
istio.citadel.process.virtual_memory_bytes,gauge,,byte,,[OpenMetrics V1 and V2] Virtual memory size in bytes.,0,istio,,
istio.galley.validation.config_update_error,count,,error,,[OpenMetrics V1 and V2] K8s webhook configuration update error,0,istio,,
istio.citadel.server.cert_chain_expiry_timestamp,gauge,,second,,[OpenMetrics V1 and V2] The unix timestamp (in seconds) when Citadel cert chain will expire. Negative in case of internal error,0,istio,,
istio.citadel.server.root_cert_expiry_timestamp,gauge,,second,,[OpenMetrics V1 and V2] The unix timestamp (in seconds) when Citadel root cert will expire. Negative in case of internal error,0,istio,,
istio.galley.validation.failed,count,,,,[OpenMetrics V1 and V2 and Istio v1.5+] Count of resource validation failed,0,istio,,
istio.pilot.conflict.outbound_listener.http_over_https,gauge,,,,[OpenMetrics V1 and V2 and Istio v1.5+] Number of conflicting HTTP listeners with well known HTTPS ports,0,istio,,
Expand Down
2 changes: 2 additions & 0 deletions istio/tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@

ISTIOD_METRICS = [
'istio.citadel.server.root_cert_expiry_timestamp',
'istio.citadel.server.cert_chain_expiry_timestamp',
'istio.galley.endpoint_no_pod',
'istio.galley.validation.config_update_error',
'istio.galley.validation.config_update',
Expand Down Expand Up @@ -210,6 +211,7 @@
]

ISTIOD_V2_METRICS = [
'istio.citadel.server.cert_chain_expiry_timestamp',
'istio.citadel.server.root_cert_expiry_timestamp',
'istio.galley.endpoint_no_pod',
'istio.galley.validation.config_update_error.count',
Expand Down
5 changes: 4 additions & 1 deletion istio/tests/fixtures/1.5/istiod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# HELP citadel_server_cert_chain_expiry_timestamp The unix timestamp, in seconds, when Citadel cert chain will expire. A negative time indicates the cert is expired.
# TYPE citadel_server_cert_chain_expiry_timestamp gauge
citadel_server_cert_chain_expiry_timestamp 2.310923901e+09
# HELP citadel_server_root_cert_expiry_timestamp The unix timestamp, in seconds, when Citadel root cert will expire. We set it to negative in case of internal error.
# TYPE citadel_server_root_cert_expiry_timestamp gauge
citadel_server_root_cert_expiry_timestamp 1.900963606e+09
Expand Down Expand Up @@ -557,4 +560,4 @@ process_virtual_memory_max_bytes -1
sidecar_injection_requests_total 3
# HELP sidecar_injection_success_total Total number of successful Side car injection requests.
# TYPE sidecar_injection_success_total counter
sidecar_injection_success_total 3
sidecar_injection_success_total 3
1 change: 1 addition & 0 deletions istio/tests/test_e2e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from .common import ISTIOD_METRICS, ISTIOD_V2_METRICS

INTERMITTENT_METRICS = [
'istio.citadel.server.cert_chain_expiry_timestamp',
'istio.mesh.request.count',
'istio.pilot.mcp_sink.recv_failures_total',
'istio.galley.validation.passed',
Expand Down
Loading