summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Wang <angie.wang@windriver.com>2019-03-04 10:14:15 -0500
committerChris Wedgwood <cw@f00f.org>2019-03-06 04:00:19 +0000
commitf9875953731e68c7051b605f7673de25894af69b (patch)
tree337a69852673f7b857b4dfc93b8834eb3414f521
parentdbc69e392098fdbd9ae5dd5da7988fa1c147f4fa (diff)
Ceilometer chart: Add missing definition files
This commit adds two missing definition files which are meters.yaml and polling.yaml. meters.yaml is the meter definition file that used for ceilometer notification agent to convert meters. polling.yaml is the polling definition file that used for ceilometer polling agents to pull meters. Change-Id: I6b9b7543aa1a77661d6a86166af59fde85085513 Story: 2005019 Task: 29811 Signed-off-by: Angie Wang <angie.wang@windriver.com>
Notes
Notes (review): Code-Review+2: Pete Birley <petebirley@gmail.com> Code-Review+2: Tin Lam <tin@irrational.io> Workflow+1: Chris Wedgwood <cw@f00f.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 06 Mar 2019 05:33:34 +0000 Reviewed-on: https://review.openstack.org/640828 Project: openstack/openstack-helm Branch: refs/heads/master
-rw-r--r--ceilometer/templates/configmap-etc.yaml2
-rw-r--r--ceilometer/templates/daemonset-compute.yaml4
-rw-r--r--ceilometer/templates/deployment-central.yaml4
-rw-r--r--ceilometer/templates/deployment-notification.yaml8
-rw-r--r--ceilometer/values.yaml312
5 files changed, 330 insertions, 0 deletions
diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml
index 17ddb1b..43a69d7 100644
--- a/ceilometer/templates/configmap-etc.yaml
+++ b/ceilometer/templates/configmap-etc.yaml
@@ -120,5 +120,7 @@ data:
120 pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }} 120 pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }}
121 event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }} 121 event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }}
122 gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }} 122 gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }}
123 meters.yaml: {{ toYaml .Values.conf.meters | b64enc }}
124 polling.yaml: {{ toYaml .Values.conf.polling | b64enc }}
123{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }} 125{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }}
124{{- end }} 126{{- end }}
diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml
index 3ae8aaa..db51482 100644
--- a/ceilometer/templates/daemonset-compute.yaml
+++ b/ceilometer/templates/daemonset-compute.yaml
@@ -92,6 +92,10 @@ spec:
92 mountPath: /etc/ceilometer/gnocchi_resources.yaml 92 mountPath: /etc/ceilometer/gnocchi_resources.yaml
93 subPath: gnocchi_resources.yaml 93 subPath: gnocchi_resources.yaml
94 readOnly: true 94 readOnly: true
95 - name: ceilometer-etc
96 mountPath: /etc/ceilometer/polling.yaml
97 subPath: polling.yaml
98 readOnly: true
95 - name: ceilometer-bin 99 - name: ceilometer-bin
96 mountPath: /tmp/ceilometer-compute.sh 100 mountPath: /tmp/ceilometer-compute.sh
97 subPath: ceilometer-compute.sh 101 subPath: ceilometer-compute.sh
diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml
index adc45ae..b546e1a 100644
--- a/ceilometer/templates/deployment-central.yaml
+++ b/ceilometer/templates/deployment-central.yaml
@@ -90,6 +90,10 @@ spec:
90 mountPath: /etc/ceilometer/gnocchi_resources.yaml 90 mountPath: /etc/ceilometer/gnocchi_resources.yaml
91 subPath: gnocchi_resources.yaml 91 subPath: gnocchi_resources.yaml
92 readOnly: true 92 readOnly: true
93 - name: ceilometer-etc
94 mountPath: /etc/ceilometer/polling.yaml
95 subPath: polling.yaml
96 readOnly: true
93 - name: ceilometer-bin 97 - name: ceilometer-bin
94 mountPath: /tmp/ceilometer-central.sh 98 mountPath: /tmp/ceilometer-central.sh
95 subPath: ceilometer-central.sh 99 subPath: ceilometer-central.sh
diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml
index 402fa8c..c6adca2 100644
--- a/ceilometer/templates/deployment-notification.yaml
+++ b/ceilometer/templates/deployment-notification.yaml
@@ -90,6 +90,12 @@ spec:
90 mountPath: /etc/ceilometer/gnocchi_resources.yaml 90 mountPath: /etc/ceilometer/gnocchi_resources.yaml
91 subPath: gnocchi_resources.yaml 91 subPath: gnocchi_resources.yaml
92 readOnly: true 92 readOnly: true
93 - name: etc-ceilometer-meters
94 mountPath: /etc/ceilometer/meters.d
95 - name: ceilometer-etc
96 mountPath: /etc/ceilometer/meters.d/meters.yaml
97 subPath: meters.yaml
98 readOnly: true
93 - name: ceilometer-bin 99 - name: ceilometer-bin
94 mountPath: /tmp/ceilometer-notification.sh 100 mountPath: /tmp/ceilometer-notification.sh
95 subPath: ceilometer-notification.sh 101 subPath: ceilometer-notification.sh
@@ -98,6 +104,8 @@ spec:
98 volumes: 104 volumes:
99 - name: pod-etc-ceilometer 105 - name: pod-etc-ceilometer
100 emptyDir: {} 106 emptyDir: {}
107 - name: etc-ceilometer-meters
108 emptyDir: {}
101 - name: ceilometer-etc 109 - name: ceilometer-etc
102 secret: 110 secret:
103 secretName: ceilometer-etc 111 secretName: ceilometer-etc
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index b72f74f..d674e3c 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -937,6 +937,312 @@ conf:
937 - hardware.network.outgoing.bytes 937 - hardware.network.outgoing.bytes
938 - hardware.network.outgoing.errors 938 - hardware.network.outgoing.errors
939 resource_type: host_network_interface 939 resource_type: host_network_interface
940 meters:
941 metric:
942 - name: "image.size"
943 event_type:
944 - "image.upload"
945 - "image.delete"
946 - "image.update"
947 type: "gauge"
948 unit: B
949 volume: $.payload.size
950 resource_id: $.payload.id
951 project_id: $.payload.owner
952 - name: "image.download"
953 event_type: "image.send"
954 type: "delta"
955 unit: "B"
956 volume: $.payload.bytes_sent
957 resource_id: $.payload.image_id
958 user_id: $.payload.receiver_user_id
959 project_id: $.payload.receiver_tenant_id
960 - name: "image.serve"
961 event_type: "image.send"
962 type: "delta"
963 unit: "B"
964 volume: $.payload.bytes_sent
965 resource_id: $.payload.image_id
966 project_id: $.payload.owner_id
967 - name: 'volume.size'
968 event_type:
969 - 'volume.exists'
970 - 'volume.create.*'
971 - 'volume.delete.*'
972 - 'volume.resize.*'
973 - 'volume.attach.*'
974 - 'volume.detach.*'
975 - 'volume.update.*'
976 type: 'gauge'
977 unit: 'GB'
978 volume: $.payload.size
979 user_id: $.payload.user_id
980 project_id: $.payload.tenant_id
981 resource_id: $.payload.volume_id
982 metadata:
983 display_name: $.payload.display_name
984 volume_type: $.payload.volume_type
985 - name: 'snapshot.size'
986 event_type:
987 - 'snapshot.exists'
988 - 'snapshot.create.*'
989 - 'snapshot.delete.*'
990 type: 'gauge'
991 unit: 'GB'
992 volume: $.payload.volume_size
993 user_id: $.payload.user_id
994 project_id: $.payload.tenant_id
995 resource_id: $.payload.snapshot_id
996 metadata:
997 display_name: $.payload.display_name
998 - name: 'backup.size'
999 event_type:
1000 - 'backup.exists'
1001 - 'backup.create.*'
1002 - 'backup.delete.*'
1003 - 'backup.restore.*'
1004 type: 'gauge'
1005 unit: 'GB'
1006 volume: $.payload.size
1007 user_id: $.payload.user_id
1008 project_id: $.payload.tenant_id
1009 resource_id: $.payload.backup_id
1010 metadata:
1011 display_name: $.payload.display_name
1012 - name: $.payload.metrics.[*].name
1013 event_type: 'magnum.bay.metrics.*'
1014 type: 'gauge'
1015 unit: $.payload.metrics.[*].unit
1016 volume: $.payload.metrics.[*].value
1017 user_id: $.payload.user_id
1018 project_id: $.payload.project_id
1019 resource_id: $.payload.resource_id
1020 lookup: ['name', 'unit', 'volume']
1021 - name: $.payload.measurements.[*].metric.[*].name
1022 event_type: 'objectstore.http.request'
1023 type: 'delta'
1024 unit: $.payload.measurements.[*].metric.[*].unit
1025 volume: $.payload.measurements.[*].result
1026 resource_id: $.payload.target.id
1027 user_id: $.payload.initiator.id
1028 project_id: $.payload.initiator.project_id
1029 lookup: ['name', 'unit', 'volume']
1030 - name: 'memory'
1031 event_type: 'compute.instance.*'
1032 type: 'gauge'
1033 unit: 'MB'
1034 volume: $.payload.memory_mb
1035 user_id: $.payload.user_id
1036 project_id: $.payload.tenant_id
1037 resource_id: $.payload.instance_id
1038 user_metadata: $.payload.metadata
1039 metadata: &instance_meta
1040 host: $.payload.host
1041 flavor_id: $.payload.instance_flavor_id
1042 flavor_name: $.payload.instance_type
1043 display_name: $.payload.display_name
1044 host: $.payload.host
1045 image_ref: $.payload.image_meta.base_image_ref
1046 - name: 'vcpus'
1047 event_type: 'compute.instance.*'
1048 type: 'gauge'
1049 unit: 'vcpu'
1050 volume: $.payload.vcpus
1051 user_id: $.payload.user_id
1052 project_id: $.payload.tenant_id
1053 resource_id: $.payload.instance_id
1054 user_metadata: $.payload.metadata
1055 metadata:
1056 <<: *instance_meta
1057 - name: 'compute.instance.booting.time'
1058 event_type: 'compute.instance.create.end'
1059 type: 'gauge'
1060 unit: 'sec'
1061 volume:
1062 fields: [$.payload.created_at, $.payload.launched_at]
1063 plugin: 'timedelta'
1064 project_id: $.payload.tenant_id
1065 resource_id: $.payload.instance_id
1066 user_metadata: $.payload.metadata
1067 metadata:
1068 <<: *instance_meta
1069 - name: 'disk.root.size'
1070 event_type: 'compute.instance.*'
1071 type: 'gauge'
1072 unit: 'GB'
1073 volume: $.payload.root_gb
1074 user_id: $.payload.user_id
1075 project_id: $.payload.tenant_id
1076 resource_id: $.payload.instance_id
1077 user_metadata: $.payload.metadata
1078 metadata:
1079 <<: *instance_meta
1080 - name: 'disk.ephemeral.size'
1081 event_type: 'compute.instance.*'
1082 type: 'gauge'
1083 unit: 'GB'
1084 volume: $.payload.ephemeral_gb
1085 user_id: $.payload.user_id
1086 project_id: $.payload.tenant_id
1087 resource_id: $.payload.instance_id
1088 user_metadata: $.payload.metadata
1089 metadata:
1090 <<: *instance_meta
1091 - name: 'bandwidth'
1092 event_type: 'l3.meter'
1093 type: 'delta'
1094 unit: 'B'
1095 volume: $.payload.bytes
1096 project_id: $.payload.tenant_id
1097 resource_id: $.payload.label_id
1098 - name: 'compute.node.cpu.frequency'
1099 event_type: 'compute.metrics.update'
1100 type: 'gauge'
1101 unit: 'MHz'
1102 volume: $.payload.metrics[?(@.name='cpu.frequency')].value
1103 resource_id: $.payload.host + "_" + $.payload.nodename
1104 timestamp: $.payload.metrics[?(@.name='cpu.frequency')].timestamp
1105 metadata:
1106 event_type: $.event_type
1107 host: $.publisher_id
1108 source: $.payload.metrics[?(@.name='cpu.frequency')].source
1109 - name: 'compute.node.cpu.user.time'
1110 event_type: 'compute.metrics.update'
1111 type: 'cumulative'
1112 unit: 'ns'
1113 volume: $.payload.metrics[?(@.name='cpu.user.time')].value
1114 resource_id: $.payload.host + "_" + $.payload.nodename
1115 timestamp: $.payload.metrics[?(@.name='cpu.user.time')].timestamp
1116 metadata:
1117 event_type: $.event_type
1118 host: $.publisher_id
1119 source: $.payload.metrics[?(@.name='cpu.user.time')].source
1120 - name: 'compute.node.cpu.kernel.time'
1121 event_type: 'compute.metrics.update'
1122 type: 'cumulative'
1123 unit: 'ns'
1124 volume: $.payload.metrics[?(@.name='cpu.kernel.time')].value
1125 resource_id: $.payload.host + "_" + $.payload.nodename
1126 timestamp: $.payload.metrics[?(@.name='cpu.kernel.time')].timestamp
1127 metadata:
1128 event_type: $.event_type
1129 host: $.publisher_id
1130 source: $.payload.metrics[?(@.name='cpu.kernel.time')].source
1131 - name: 'compute.node.cpu.idle.time'
1132 event_type: 'compute.metrics.update'
1133 type: 'cumulative'
1134 unit: 'ns'
1135 volume: $.payload.metrics[?(@.name='cpu.idle.time')].value
1136 resource_id: $.payload.host + "_" + $.payload.nodename
1137 timestamp: $.payload.metrics[?(@.name='cpu.idle.time')].timestamp
1138 metadata:
1139 event_type: $.event_type
1140 host: $.publisher_id
1141 source: $.payload.metrics[?(@.name='cpu.idle.time')].source
1142 - name: 'compute.node.cpu.iowait.time'
1143 event_type: 'compute.metrics.update'
1144 type: 'cumulative'
1145 unit: 'ns'
1146 volume: $.payload.metrics[?(@.name='cpu.iowait.time')].value
1147 resource_id: $.payload.host + "_" + $.payload.nodename
1148 timestamp: $.payload.metrics[?(@.name='cpu.iowait.time')].timestamp
1149 metadata:
1150 event_type: $.event_type
1151 host: $.publisher_id
1152 source: $.payload.metrics[?(@.name='cpu.iowait.time')].source
1153 - name: 'compute.node.cpu.kernel.percent'
1154 event_type: 'compute.metrics.update'
1155 type: 'gauge'
1156 unit: 'percent'
1157 volume: $.payload.metrics[?(@.name='cpu.kernel.percent')].value * 100
1158 resource_id: $.payload.host + "_" + $.payload.nodename
1159 timestamp: $.payload.metrics[?(@.name='cpu.kernel.percent')].timestamp
1160 metadata:
1161 event_type: $.event_type
1162 host: $.publisher_id
1163 source: $.payload.metrics[?(@.name='cpu.kernel.percent')].source
1164 - name: 'compute.node.cpu.idle.percent'
1165 event_type: 'compute.metrics.update'
1166 type: 'gauge'
1167 unit: 'percent'
1168 volume: $.payload.metrics[?(@.name='cpu.idle.percent')].value * 100
1169 resource_id: $.payload.host + "_" + $.payload.nodename
1170 timestamp: $.payload.metrics[?(@.name='cpu.idle.percent')].timestamp
1171 metadata:
1172 event_type: $.event_type
1173 host: $.publisher_id
1174 source: $.payload.metrics[?(@.name='cpu.idle.percent')].source
1175 - name: 'compute.node.cpu.user.percent'
1176 event_type: 'compute.metrics.update'
1177 type: 'gauge'
1178 unit: 'percent'
1179 volume: $.payload.metrics[?(@.name='cpu.user.percent')].value * 100
1180 resource_id: $.payload.host + "_" + $.payload.nodename
1181 timestamp: $.payload.metrics[?(@.name='cpu.user.percent')].timestamp
1182 metadata:
1183 event_type: $.event_type
1184 host: $.publisher_id
1185 source: $.payload.metrics[?(@.name='cpu.user.percent')].source
1186 - name: 'compute.node.cpu.iowait.percent'
1187 event_type: 'compute.metrics.update'
1188 type: 'gauge'
1189 unit: 'percent'
1190 volume: $.payload.metrics[?(@.name='cpu.iowait.percent')].value * 100
1191 resource_id: $.payload.host + "_" + $.payload.nodename
1192 timestamp: $.payload.metrics[?(@.name='cpu.iowait.percent')].timestamp
1193 metadata:
1194 event_type: $.event_type
1195 host: $.publisher_id
1196 source: $.payload.metrics[?(@.name='cpu.iowait.percent')].source
1197 - name: 'compute.node.cpu.percent'
1198 event_type: 'compute.metrics.update'
1199 type: 'gauge'
1200 unit: 'percent'
1201 volume: $.payload.metrics[?(@.name='cpu.percent')].value * 100
1202 resource_id: $.payload.host + "_" + $.payload.nodename
1203 timestamp: $.payload.metrics[?(@.name='cpu.percent')].timestamp
1204 metadata:
1205 event_type: $.event_type
1206 host: $.publisher_id
1207 source: $.payload.metrics[?(@.name='cpu.percent')].source
1208 - name: $.payload.outcome - $.payload.outcome + 'identity.authenticate.' + $.payload.outcome
1209 type: 'delta'
1210 unit: 'user'
1211 volume: 1
1212 event_type:
1213 - 'identity.authenticate'
1214 resource_id: $.payload.initiator.id
1215 user_id: $.payload.initiator.id
1216 - name: 'dns.domain.exists'
1217 event_type: 'dns.domain.exists'
1218 type: 'cumulative'
1219 unit: 's'
1220 volume:
1221 fields: [$.payload.audit_period_beginning, $.payload.audit_period_ending]
1222 plugin: 'timedelta'
1223 project_id: $.payload.tenant_id
1224 resource_id: $.payload.id
1225 user_id: $._context_user
1226 metadata:
1227 status: $.payload.status
1228 pool_id: $.payload.pool_id
1229 host: $.publisher_id
1230 - name: 'trove.instance.exists'
1231 event_type: 'trove.instance.exists'
1232 type: 'cumulative'
1233 unit: 's'
1234 volume:
1235 fields: [$.payload.audit_period_beginning, $.payload.audit_period_ending]
1236 plugin: 'timedelta'
1237 project_id: $.payload.tenant_id
1238 resource_id: $.payload.instance_id
1239 user_id: $.payload.user_id
1240 metadata:
1241 nova_instance_id: $.payload.nova_instance_id
1242 state: $.payload.state
1243 service_id: $.payload.service_id
1244 instance_type: $.payload.instance_type
1245 instance_type_id: $.payload.instance_type_id
940 paste: 1246 paste:
941 'app:api-server': 1247 'app:api-server':
942 paste.app_factory: 'ceilometer.api.app:app_factory' 1248 paste.app_factory: 'ceilometer.api.app:app_factory'
@@ -954,6 +1260,12 @@ conf:
954 paste.filter_factory: 'oslo_middleware:RequestId.factory' 1260 paste.filter_factory: 'oslo_middleware:RequestId.factory'
955 'pipeline:main': 1261 'pipeline:main':
956 pipeline: cors http_proxy_to_wsgi request_id authtoken api-server 1262 pipeline: cors http_proxy_to_wsgi request_id authtoken api-server
1263 polling:
1264 sources:
1265 - name: all_pollsters
1266 interval: 600
1267 meters:
1268 - "*"
957 pipeline: 1269 pipeline:
958 sources: 1270 sources:
959 - name: meter_source 1271 - name: meter_source