From 2f5bdd402affef56c340a9ece577036d8183e8fe Mon Sep 17 00:00:00 2001 From: Gordon Kelly Date: Fri, 19 Jan 2018 16:13:45 +0000 Subject: docker: update ves image to load yaml and config files Update ves image to load yaml and config files from /opt/ves/ directory and rename host yaml file. Change-Id: I3caf51150d10db08b8ef1c20a53c320b27a6acb8 Signed-off-by: gordonkelly --- 3rd_party/collectd-ves-app/ves_app/yaml/host.yaml | 287 +++++++++++++++++++++ .../collectd-ves-app/ves_app/yaml/native.yaml | 287 --------------------- docker/barometer-ves/Dockerfile | 18 +- docker/barometer-ves/start_ves_app.sh | 11 +- 4 files changed, 306 insertions(+), 297 deletions(-) create mode 100644 3rd_party/collectd-ves-app/ves_app/yaml/host.yaml delete mode 100644 3rd_party/collectd-ves-app/ves_app/yaml/native.yaml diff --git a/3rd_party/collectd-ves-app/ves_app/yaml/host.yaml b/3rd_party/collectd-ves-app/ves_app/yaml/host.yaml new file mode 100644 index 00000000..8a351547 --- /dev/null +++ b/3rd_party/collectd-ves-app/ves_app/yaml/host.yaml @@ -0,0 +1,287 @@ +--- +# Common event header definition (required fields and defaults) +commonEventHeader: &commonEventHeader + domain: N/A + eventId: "{system.id}" + eventName: "" + eventType: Info + lastEpochMicrosec: 0 + priority: Normal + reportingEntityId: &reportingEntityId "{system.hostname}" + reportingEntityName: *reportingEntityId + sequence: 0 + sourceName: N/A + startEpochMicrosec: 0 + version: 2.0 + +# Host measurements definition +Host Measurements: !Measurements + - ITEM-DESC: + event: + commonEventHeader: &hostCommonEventHeader + <<: *commonEventHeader + eventType: platform + domain: measurementsForVfScaling + sourceId: &sourceId "{vl.host}" + sourceName: *sourceId + startEpochMicrosec: !Number "{vl.time}" + measurementsForVfScalingFields: &hostMeasurementsForVfScalingFields + measurementsForVfScalingVersion: 2.0 + additionalMeasurements: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: "/^(?!memory|cpu|interface|disk).*$/" + - INDEX-KEY: + - host + - plugin + - plugin_instance + - ITEM-DESC: + name: !StripExtraDash "{vl.plugin}-{vl.plugin_instance}" + arrayOfFields: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: "{vl.plugin}" + plugin_instance: "{vl.plugin_instance}" + - ITEM-DESC: + name: !StripExtraDash "{vl.type}-{vl.type_instance}-{vl.ds_name}" + value: "{vl.value}" + measurementInterval: !Number "{vl.interval}" + memoryUsageArray: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: free + - ITEM-DESC: + vmIdentifier: "{vl.host}" + memoryFree: !Number "{vl.value}" + memoryUsed: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: used + - VALUE: !Bytes2Kibibytes "{vl.value}" + memoryBuffered: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: buffered + - VALUE: !Bytes2Kibibytes "{vl.value}" + memoryCached: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: cached + - VALUE: !Bytes2Kibibytes "{vl.value}" + memorySlabRecl: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: slab_recl + - VALUE: !Bytes2Kibibytes "{vl.value}" + - DEFAULT: 0 + memorySlabUnrecl: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: memory + type: memory + type_instance: slab_unrecl + - VALUE: !Bytes2Kibibytes "{vl.value}" + - DEFAULT: 0 + cpuUsageArray: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: cpu + type: percent + type_instance: idle + - ITEM-DESC: + cpuIdentifier: "{vl.plugin_instance}" + cpuIdle: !Number "{vl.value}" + percentUsage: 0.0 + cpuUsageUser: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: user + cpuWait: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: wait + cpuUsageInterrupt: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: interrupt + cpuUsageNice: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: nice + cpuUsageSoftIrq: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: softirq + cpuUsageSteal: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: steal + cpuUsageSystem: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: cpu + plugin_instance: "{vl.plugin_instance}" + type: percent + type_instance: system + vNicPerformanceArray: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: interface + type: if_packets + ds_name: rx + - ITEM-DESC: + valuesAreSuspect: "true" + vNicIdentifier: "{vl.plugin_instance}" + receivedTotalPacketsAccumulated: !Number "{vl.value}" + transmittedTotalPacketsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_packets + ds_name: tx + receivedOctetsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_octets + ds_name: rx + transmittedOctetsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_octets + ds_name: tx + receivedErrorPacketsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_errors + ds_name: rx + transmittedErrorPacketsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_errors + ds_name: tx + receivedDiscardedPacketsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_dropped + ds_name: rx + transmittedDiscardedPacketsAccumulated: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: interface + plugin_instance: "{vl.plugin_instance}" + type: if_dropped + ds_name: tx + diskUsageArray: !ArrayItem + - SELECT: + host: "{vl.host}" + plugin: disk + type: disk_octets + ds_name: read + - ITEM-DESC: + diskIdentifier: "{vl.plugin_instance}" + diskOctetsReadLast: !Number "{vl.value}" + diskOctetsWriteLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_octets + ds_name: write + diskOpsReadLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_ops + ds_name: read + diskOpsWriteLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_ops + ds_name: write + diskIoTimeLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_io_time + ds_name: io_time + - DEFAULT: 0 + diskMergedReadLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_merged + ds_name: read + - DEFAULT: 0 + diskMergedWriteLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_merged + ds_name: write + - DEFAULT: 0 + diskTimeReadLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_time + ds_name: read + - DEFAULT: 0 + diskTimeWriteLast: !ValueItem + - SELECT: + host: "{vl.host}" + plugin: disk + plugin_instance: "{vl.plugin_instance}" + type: disk_time + ds_name: write + - DEFAULT: 0 + - SELECT: + plugin: memory + type_instance: free + + diff --git a/3rd_party/collectd-ves-app/ves_app/yaml/native.yaml b/3rd_party/collectd-ves-app/ves_app/yaml/native.yaml deleted file mode 100644 index 8a351547..00000000 --- a/3rd_party/collectd-ves-app/ves_app/yaml/native.yaml +++ /dev/null @@ -1,287 +0,0 @@ ---- -# Common event header definition (required fields and defaults) -commonEventHeader: &commonEventHeader - domain: N/A - eventId: "{system.id}" - eventName: "" - eventType: Info - lastEpochMicrosec: 0 - priority: Normal - reportingEntityId: &reportingEntityId "{system.hostname}" - reportingEntityName: *reportingEntityId - sequence: 0 - sourceName: N/A - startEpochMicrosec: 0 - version: 2.0 - -# Host measurements definition -Host Measurements: !Measurements - - ITEM-DESC: - event: - commonEventHeader: &hostCommonEventHeader - <<: *commonEventHeader - eventType: platform - domain: measurementsForVfScaling - sourceId: &sourceId "{vl.host}" - sourceName: *sourceId - startEpochMicrosec: !Number "{vl.time}" - measurementsForVfScalingFields: &hostMeasurementsForVfScalingFields - measurementsForVfScalingVersion: 2.0 - additionalMeasurements: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: "/^(?!memory|cpu|interface|disk).*$/" - - INDEX-KEY: - - host - - plugin - - plugin_instance - - ITEM-DESC: - name: !StripExtraDash "{vl.plugin}-{vl.plugin_instance}" - arrayOfFields: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: "{vl.plugin}" - plugin_instance: "{vl.plugin_instance}" - - ITEM-DESC: - name: !StripExtraDash "{vl.type}-{vl.type_instance}-{vl.ds_name}" - value: "{vl.value}" - measurementInterval: !Number "{vl.interval}" - memoryUsageArray: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: free - - ITEM-DESC: - vmIdentifier: "{vl.host}" - memoryFree: !Number "{vl.value}" - memoryUsed: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: used - - VALUE: !Bytes2Kibibytes "{vl.value}" - memoryBuffered: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: buffered - - VALUE: !Bytes2Kibibytes "{vl.value}" - memoryCached: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: cached - - VALUE: !Bytes2Kibibytes "{vl.value}" - memorySlabRecl: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: slab_recl - - VALUE: !Bytes2Kibibytes "{vl.value}" - - DEFAULT: 0 - memorySlabUnrecl: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: memory - type: memory - type_instance: slab_unrecl - - VALUE: !Bytes2Kibibytes "{vl.value}" - - DEFAULT: 0 - cpuUsageArray: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: cpu - type: percent - type_instance: idle - - ITEM-DESC: - cpuIdentifier: "{vl.plugin_instance}" - cpuIdle: !Number "{vl.value}" - percentUsage: 0.0 - cpuUsageUser: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: user - cpuWait: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: wait - cpuUsageInterrupt: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: interrupt - cpuUsageNice: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: nice - cpuUsageSoftIrq: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: softirq - cpuUsageSteal: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: steal - cpuUsageSystem: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: cpu - plugin_instance: "{vl.plugin_instance}" - type: percent - type_instance: system - vNicPerformanceArray: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: interface - type: if_packets - ds_name: rx - - ITEM-DESC: - valuesAreSuspect: "true" - vNicIdentifier: "{vl.plugin_instance}" - receivedTotalPacketsAccumulated: !Number "{vl.value}" - transmittedTotalPacketsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_packets - ds_name: tx - receivedOctetsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_octets - ds_name: rx - transmittedOctetsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_octets - ds_name: tx - receivedErrorPacketsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_errors - ds_name: rx - transmittedErrorPacketsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_errors - ds_name: tx - receivedDiscardedPacketsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_dropped - ds_name: rx - transmittedDiscardedPacketsAccumulated: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: interface - plugin_instance: "{vl.plugin_instance}" - type: if_dropped - ds_name: tx - diskUsageArray: !ArrayItem - - SELECT: - host: "{vl.host}" - plugin: disk - type: disk_octets - ds_name: read - - ITEM-DESC: - diskIdentifier: "{vl.plugin_instance}" - diskOctetsReadLast: !Number "{vl.value}" - diskOctetsWriteLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_octets - ds_name: write - diskOpsReadLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_ops - ds_name: read - diskOpsWriteLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_ops - ds_name: write - diskIoTimeLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_io_time - ds_name: io_time - - DEFAULT: 0 - diskMergedReadLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_merged - ds_name: read - - DEFAULT: 0 - diskMergedWriteLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_merged - ds_name: write - - DEFAULT: 0 - diskTimeReadLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_time - ds_name: read - - DEFAULT: 0 - diskTimeWriteLast: !ValueItem - - SELECT: - host: "{vl.host}" - plugin: disk - plugin_instance: "{vl.plugin_instance}" - type: disk_time - ds_name: write - - DEFAULT: 0 - - SELECT: - plugin: memory - type_instance: free - - diff --git a/docker/barometer-ves/Dockerfile b/docker/barometer-ves/Dockerfile index 869a587f..e36ef848 100644 --- a/docker/barometer-ves/Dockerfile +++ b/docker/barometer-ves/Dockerfile @@ -22,14 +22,18 @@ RUN yum install -y python-pip RUN pip install pyyaml \ kafka-python -ENV repos_dir /src -ENV ves_dir barometer/3rd_party/collectd-ves-app/ves_app -WORKDIR ${repos_dir} +ENV VES_DIR /opt/ves +ENV REPOS_DIR /src + +RUN mkdir -p ${VES_DIR}/yaml +RUN mkdir -p ${VES_DIR}/config +WORKDIR ${REPOS_DIR} RUN git clone https://gerrit.opnfv.org/gerrit/barometer -WORKDIR ${ves_dir} -COPY start_ves_app.sh ${ves_dir}/start_ves_app.sh -RUN chmod +x ${ves_dir}/start_ves_app.sh +COPY ./start_ves_app.sh ${VES_DIR}/ +RUN cp -rf barometer/3rd_party/collectd-ves-app/ves_app/* ${VES_DIR} +WORKDIR ${VES_DIR} +RUN chmod 755 ${VES_DIR}/start_ves_app.sh -ENTRYPOINT ["./barometer/3rd_party/collectd-ves-app/ves_app/start_ves_app.sh"] +ENTRYPOINT ["./start_ves_app.sh"] CMD ["host.yaml"] diff --git a/docker/barometer-ves/start_ves_app.sh b/docker/barometer-ves/start_ves_app.sh index d61078db..f859bc45 100644 --- a/docker/barometer-ves/start_ves_app.sh +++ b/docker/barometer-ves/start_ves_app.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 OPNFV and Intel Corporation +#Copyright 2018 OPNFV and Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,12 @@ YAML_FILE="$1" +if [ -z "${ves_kafka_host}" ] +then + ves_kafka_host=localhost +fi + #wait for kafka service to be available -while ! nc localhost 9092 < /dev/null; do sleep 1; done +while ! nc $ves_kafka_host 9092 < /dev/null; do sleep 1; done -python ves_app.py --events-schema="$YAML_FILE" --config=ves_app_config.conf +python ves_app.py --events-schema="./yaml/$YAML_FILE" --config="./config/ves_app_config.conf" -- cgit 1.2.3-korg