Skip to content

Commit afe5b09

Browse files
authored
Reconfigure ceilometer-compute agents to enable prom-exporter (#645)
* disable rabbitmq and enable prom-exporter
1 parent e4ad5c9 commit afe5b09

File tree

5 files changed

+34
-3
lines changed

5 files changed

+34
-3
lines changed

api/v1beta1/telemetry_consts.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ const (
3030
DefaultPodmanExporterPort = 9882
3131
// DefaultDataplaneNodeExporterPort -
3232
DefaultOpenStackNetworkExporterPort = 9105
33+
// DefaultCeilometerComputePromExporterPort -
34+
DefaultCeilometerComputePromExporterPort = 9101
3335
// DefaultScrapeInterval -
3436
DefaultScrapeInterval = "30s"
3537
// PauseBetweenWatchAttempts -

controllers/metricstorage_controller.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,11 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
835835
if err != nil {
836836
return ctrl.Result{}, err
837837
}
838-
838+
// openstack Ceilometer Compute's prom exporters
839+
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "ceilometer-compute-prom-exporter", telemetryv1.DefaultCeilometerComputePromExporterPort, true)
840+
if err != nil {
841+
return ctrl.Result{}, err
842+
}
839843
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "podman-exporter", telemetryv1.DefaultPodmanExporterPort, false)
840844
if err != nil {
841845
return ctrl.Result{}, err

templates/ceilometercompute/config/ceilometer.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ debug=True
44
log_dir=/var/log/ceilometer
55
rpc_response_timeout=60
66
polling_namespaces=compute
7-
transport_url={{ .TransportURL }}
87

98
[service_credentials]
109
auth_type=password
@@ -29,10 +28,12 @@ notify_address_prefix=
2928
[oslo_messaging_notifications]
3029
driver=messagingv2
3130
topics=notifications
32-
transport_url={{ .TransportURL }}
3331

3432
[polling]
3533
heartbeat_socket_dir=/var/lib/ceilometer
34+
enable_notifications=False
35+
enable_prometheus_exporter=true
36+
prometheus_listen_addresses='0.0.0.0:9101'
3637

3738
[publisher]
3839
telemetry_secret=eQ5qb0yysfJ8lx82Vl061vSyY

tests/kuttl/suites/metricstorage/tests/01-assert.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,18 @@ spec:
8585
---
8686
apiVersion: monitoring.rhobs/v1alpha1
8787
kind: ScrapeConfig
88+
metadata:
89+
labels:
90+
service: metricStorage
91+
name: telemetry-ceilometer-compute-prom-exporter
92+
ownerReferences:
93+
- kind: MetricStorage
94+
name: telemetry-kuttl
95+
spec:
96+
scrapeInterval: 30s
97+
---
98+
apiVersion: monitoring.rhobs/v1alpha1
99+
kind: ScrapeConfig
88100
metadata:
89101
labels:
90102
service: metricStorage

tests/kuttl/suites/metricstorage/tests/04-assert.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@ spec:
9797
---
9898
apiVersion: monitoring.rhobs/v1alpha1
9999
kind: ScrapeConfig
100+
metadata:
101+
labels:
102+
service: metricStorage
103+
name: telemetry-ceilometer-compute-prom-exporter
104+
ownerReferences:
105+
- kind: MetricStorage
106+
name: telemetry-kuttl
107+
spec:
108+
scrapeInterval: 40s
109+
---
110+
apiVersion: monitoring.rhobs/v1alpha1
111+
kind: ScrapeConfig
100112
metadata:
101113
labels:
102114
service: metricStorage

0 commit comments

Comments
 (0)