Skip to content

Commit 2c208d4

Browse files
authored
fix: OSPC-1539: updated event_type format and added blazar messaging_url (#1414)
1 parent 493e8dc commit 2c208d4

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -842,14 +842,12 @@ conf:
842842
fields: payload.type
843843
# Blazar events and metrics
844844
- event_type:
845-
- "start_lease"
846-
- "end_lease"
847-
- "before_end_lease"
848845
- "lease.create"
849846
- "lease.update"
850847
- "lease.delete"
851-
- "lease.start"
852-
- "lease.end"
848+
- "lease.event.start_lease"
849+
- "lease.event.before_end_lease"
850+
- "lease.event.end_lease"
853851
traits: &reservation_traits
854852
# Lease identification
855853
lease_id:
@@ -858,7 +856,6 @@ conf:
858856
name:
859857
fields:
860858
- payload.name
861-
862859
# User and project
863860
project_id:
864861
fields:
@@ -869,7 +866,6 @@ conf:
869866
trust_id:
870867
fields:
871868
- payload.trust_id
872-
873869
# Lease timing
874870
start_date:
875871
fields:
@@ -883,7 +879,6 @@ conf:
883879
updated_at:
884880
fields:
885881
- payload.updated_at
886-
887882
# Lease status
888883
status:
889884
fields:
@@ -951,12 +946,12 @@ conf:
951946
start_date: resource_metadata.start_date
952947
end_date: resource_metadata.end_date
953948
event_create:
954-
- start_lease
949+
- lease.event.start_lease
955950
- lease.create
956951
event_update:
957-
- before_end_lease
958-
- start_lease
959-
- end_lease
952+
- lease.event.start_lease
953+
- lease.event.before_end_lease
954+
- lease.event.end_lease"
960955
- lease.end
961956
- lease.update
962957
event_delete:
@@ -1346,7 +1341,7 @@ conf:
13461341

13471342
- name: "blazar.lease.start"
13481343
event_type:
1349-
- "start_lease"
1344+
- "lease.event.start_lease"
13501345
type: "delta"
13511346
unit: "lease"
13521347
volume: 1
@@ -1361,7 +1356,7 @@ conf:
13611356

13621357
- name: "blazar.lease.before_end"
13631358
event_type:
1364-
- "before_end_lease"
1359+
- "lease.event.before_end_lease"
13651360
type: "delta"
13661361
unit: "lease"
13671362
volume: 1
@@ -1376,7 +1371,7 @@ conf:
13761371

13771372
- name: "blazar.lease.end"
13781373
event_type:
1379-
- "end_lease"
1374+
- "lease.event.end_lease"
13801375
type: "delta"
13811376
unit: "lease"
13821377
volume: 1
@@ -1881,9 +1876,9 @@ conf:
18811876
meters:
18821877
- "*"
18831878
events:
1884-
- start_lease
1885-
- end_lease
1886-
- before_end_lease
1879+
- lease.event.start_lease
1880+
- lease.event.end_lease
1881+
- lease.event.before_end_lease
18871882
- lease.*
18881883
sinks:
18891884
- blazar_sink

bin/install-ceilometer.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ rabbit://neutron:$(kubectl --namespace openstack get secret neutron-rabbitmq-pas
144144
rabbit://cinder:$(kubectl --namespace openstack get secret cinder-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/cinder,\
145145
rabbit://heat:$(kubectl --namespace openstack get secret heat-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/heat,\
146146
rabbit://octavia:$(kubectl --namespace openstack get secret octavia-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/octavia,\
147+
rabbit://blazar:$(kubectl --namespace openstack get secret blazar-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/blazar,\
147148
rabbit://magnum:$(kubectl --namespace openstack get secret magnum-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)@rabbitmq.openstack.svc.cluster.local:5672/magnum}"
148149
)
149150

0 commit comments

Comments
 (0)