Skip to content

Commit

Permalink
[cilium] Add new metrics with v1.15+ (#18406)
Browse files Browse the repository at this point in the history
* [cilium] Add new metrics with v1.15+

Signed-off-by: Jared Ledvina <[email protected]>

* Add changelog

Signed-off-by: Jared Ledvina <[email protected]>

* Add metadata info

Signed-off-by: Jared Ledvina <[email protected]>

* count not counter

Signed-off-by: Jared Ledvina <[email protected]>

* Add more lbipam metrics

Signed-off-by: Jared Ledvina <[email protected]>

* ddev validate metadata cilium --sync

Signed-off-by: Jared Ledvina <[email protected]>

* Update 18406.added

* fix tests

---------

Signed-off-by: Jared Ledvina <[email protected]>
Co-authored-by: Steven Yuen <[email protected]>
  • Loading branch information
jaredledvina and steveny91 authored Sep 5, 2024
1 parent 32687a4 commit 8beb732
Show file tree
Hide file tree
Showing 4 changed files with 327 additions and 282 deletions.
1 change: 1 addition & 0 deletions cilium/changelog.d/18406.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add new metrics with v1.15+
21 changes: 21 additions & 0 deletions cilium/datadog_checks/cilium/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,19 @@
'cilium_kvstore_initial_sync_completed': 'kvstore.initial_sync_completed',
'cilium_k8s_client_rate_limiter_duration_seconds': 'k8s_client.rate_limiter_duration.seconds',
'cilium_policy_change_total': 'policy.change.total',
# Cilium 1.15+
'cilium_bpf_map_capacity': 'bpf.map.capacity',
'cilium_hive_status': 'hive.status',
'cilium_ipam_capacity': 'ipam.capacity',
'cilium_cidrgroups_referenced': 'cidrgroups.referenced',
'cilium_cidrgroup_translation_time_stats_seconds': 'cidrgroup.translation.time.stats.seconds',
'cilium_k8s_workqueue_adds_total': 'k8s.workqueue.adds.total',
'cilium_k8s_workqueue_depth': 'k8s.workqueue.depth',
'cilium_k8s_workqueue_longest_running_processor_seconds': 'k8s.workqueue.longest.running.processor.seconds',
'cilium_k8s_workqueue_queue_duration_seconds': 'k8s.workqueue.queue.duration.seconds',
'cilium_k8s_workqueue_retries_total': 'k8s.workqueue.retries.total',
'cilium_k8s_workqueue_unfinished_work_seconds': 'k8s.workqueue.unfinished.work.seconds',
'cilium_version': 'version',
}

OPERATOR_V2_OVERRIDES = {
Expand Down Expand Up @@ -191,6 +204,14 @@
'cilium_operator_ipam_needed_ips': 'operator.ipam.needed_ips',
'cilium_operator_ipam_release_duration_seconds': 'operator.ipam.release.duration.seconds',
'cilium_operator_ipam_used_ips': 'operator.ipam.used_ips',
# Cilium 1.15+
'cilium_hive_status': 'operator.hive.status',
'cilium_operator_errors_warnings_total': 'operator.errors.warnings.total',
'cilium_operator_lbipam_ips_available_total': 'operator.lbipam.ips.available.total',
'cilium_operator_lbipam_ips_used_total': 'operator.lbipam.ips.used.total',
'cilium_operator_lbipam_conflicting_pools_total': 'operator.lbipam.conflicting.pools.total',
'cilium_operator_lbipam_services_matching_total': 'operator.lbipam.services.matching.total',
'cilium_operator_lbipam_services_unsatisfied_total': 'operator.lbipam.services.unsatisfied.total',
}

AGENT_V2_METRICS = deepcopy(AGENT_METRICS)
Expand Down
Loading

0 comments on commit 8beb732

Please sign in to comment.