Merge "Ceilometer: move all config to be driven via chart values"
This commit is contained in:
Zuul
Gerrit Code Review
commit
40a54f5f1f
@ -112,7 +112,7 @@ metadata:
|
||||
name: ceilometer-etc
|
||||
data:
|
||||
rally_tests.yaml: |
|
||||
{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
||||
{{ toYaml .Values.conf.rally_tests | indent 4 }}
|
||||
ceilometer.conf: |
|
||||
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | indent 4 }}
|
||||
api_paste.ini: |
|
||||
@ -127,6 +127,5 @@ data:
|
||||
{{ toYaml .Values.conf.event_definitions | indent 4 }}
|
||||
gnocchi_resources.yaml: |
|
||||
{{ toYaml .Values.conf.gnocchi_resources | indent 4 }}
|
||||
wsgi-ceilometer.conf: |
|
||||
{{- tuple .Values.conf.wsgi_ceilometer "etc/_wsgi-ceilometer.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
|
||||
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" ) | indent 2 }}
|
||||
{{- end }}
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
---
|
||||
CeilometerStats.create_meter_and_get_stats:
|
||||
-
|
||||
args:
|
||||
user_id: "user-id"
|
||||
resource_id: "resource-id"
|
||||
counter_volume: 1.0
|
||||
counter_unit: ""
|
||||
counter_type: "cumulative"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
CeilometerMeters.list_meters:
|
||||
-
|
||||
runner:
|
||||
type: constant
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
context:
|
||||
ceilometer:
|
||||
counter_name: "benchmark_meter"
|
||||
counter_type: "gauge"
|
||||
counter_unit: "%"
|
||||
counter_volume: 1
|
||||
resources_per_tenant: 1
|
||||
samples_per_resource: 1
|
||||
timestamp_interval: 10
|
||||
metadata_list:
|
||||
-
|
||||
status: "active"
|
||||
name: "rally benchmark on"
|
||||
deleted: "false"
|
||||
-
|
||||
status: "terminated"
|
||||
name: "rally benchmark off"
|
||||
deleted: "true"
|
||||
args:
|
||||
limit: 5
|
||||
metadata_query:
|
||||
status: "terminated"
|
||||
CeilometerQueries.create_and_query_samples:
|
||||
-
|
||||
args:
|
||||
filter: {"=": {"counter_unit": "instance"}}
|
||||
orderby: !!null
|
||||
limit: 10
|
||||
counter_name: "cpu_util"
|
||||
counter_type: "gauge"
|
||||
counter_unit: "instance"
|
||||
counter_volume: 1.0
|
||||
resource_id: "resource_id"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
@ -1,42 +0,0 @@
|
||||
{{/*
|
||||
Copyright 2017 The Openstack-Helm Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/}}
|
||||
|
||||
Listen 0.0.0.0:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||
|
||||
<VirtualHost *:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||
LogLevel info
|
||||
WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
|
||||
WSGIProcessGroup ceilometer-api
|
||||
|
||||
WSGIScriptReloading On
|
||||
WSGIScriptAlias / /var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api/app.wsgi
|
||||
|
||||
WSGIApplicationGroup %{GLOBAL}
|
||||
|
||||
<Directory "/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api">
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
<IfVersion < 2.4>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfVersion>
|
||||
</Directory>
|
||||
ErrorLog /dev/stdout
|
||||
CustomLog /dev/stdout combined
|
||||
</VirtualHost>
|
||||
@ -1488,14 +1488,95 @@ conf:
|
||||
'telemetry:get_sample': ''
|
||||
'telemetry:get_samples': ''
|
||||
'telemetry:query_sample': ''
|
||||
wsgi_ceilometer: |
|
||||
Listen 0.0.0.0:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||
|
||||
<VirtualHost *:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||
LogLevel info
|
||||
WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
|
||||
WSGIProcessGroup ceilometer-api
|
||||
|
||||
WSGIScriptReloading On
|
||||
WSGIScriptAlias / /var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api/app.wsgi
|
||||
|
||||
WSGIApplicationGroup %{GLOBAL}
|
||||
|
||||
<Directory "/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api">
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
<IfVersion < 2.4>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfVersion>
|
||||
</Directory>
|
||||
ErrorLog /dev/stdout
|
||||
CustomLog /dev/stdout combined
|
||||
</VirtualHost>
|
||||
rally_tests:
|
||||
append: null
|
||||
metering:
|
||||
meter_name: ram_util
|
||||
statistic: avg
|
||||
threshold: 10
|
||||
type: threshold
|
||||
override: null
|
||||
CeilometerStats.create_meter_and_get_stats:
|
||||
- args:
|
||||
user_id: user-id
|
||||
resource_id: resource-id
|
||||
counter_volume: 1
|
||||
counter_unit: ''
|
||||
counter_type: cumulative
|
||||
runner:
|
||||
type: constant
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
CeilometerMeters.list_meters:
|
||||
- runner:
|
||||
type: constant
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
context:
|
||||
ceilometer:
|
||||
counter_name: benchmark_meter
|
||||
counter_type: gauge
|
||||
counter_unit: "%"
|
||||
counter_volume: 1
|
||||
resources_per_tenant: 1
|
||||
samples_per_resource: 1
|
||||
timestamp_interval: 10
|
||||
metadata_list:
|
||||
- status: active
|
||||
name: rally benchmark on
|
||||
deleted: 'false'
|
||||
- status: terminated
|
||||
name: rally benchmark off
|
||||
deleted: 'true'
|
||||
args:
|
||||
limit: 5
|
||||
metadata_query:
|
||||
status: terminated
|
||||
CeilometerQueries.create_and_query_samples:
|
||||
- args:
|
||||
filter:
|
||||
"=":
|
||||
counter_unit: instance
|
||||
orderby:
|
||||
limit: 10
|
||||
counter_name: cpu_util
|
||||
counter_type: gauge
|
||||
counter_unit: instance
|
||||
counter_volume: 1
|
||||
resource_id: resource_id
|
||||
runner:
|
||||
type: constant
|
||||
times: 1
|
||||
concurrency: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
dependencies:
|
||||
dynamic:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user