aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2018-01-08 10:19:06 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2018-01-11 11:56:24 +0000
commitd5979bd86ef9ad5fc28d9183439381d3abcf2053 (patch)
treee26b2bc62c218b39f17bf29219ae8c9b7888a51b
parentd4479cd89385b9370b22f5157c654f0551d0dc26 (diff)
docker: cleanup directories and files
Rename docker container directories to contain the barometer_ prefix to prevent any naming clashes with other opnfv containers. Cleanup files that are no longer needed. The patch cleans up trailing whitespace. Change-Id: I332626554502a3e17685a2abd98c0679f30d0c24 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
-rw-r--r--docker/barometer-influxdb/Dockerfile (renamed from docker/influxdb/Dockerfile)1
-rw-r--r--docker/barometer-influxdb/influxdb.conf (renamed from docker/influxdb/influxdb.conf)3
-rw-r--r--docker/barometer-kafka/Dockerfile (renamed from docker/kafka/Dockerfile)0
-rwxr-xr-xdocker/barometer-kafka/start_kafka.sh (renamed from docker/kafka/start_kafka.sh)0
-rw-r--r--docker/barometer-snmp/docker-compose.yml (renamed from docker/snmp/docker-compose.yml)0
-rw-r--r--docker/barometer-snmp/snmpd.conf (renamed from docker/snmp/snmpd.conf)1
-rw-r--r--docker/docker-compose.yml16
-rwxr-xr-xdocker/get_types_db.sh14
-rw-r--r--docker/influxdb.conf33
9 files changed, 0 insertions, 68 deletions
diff --git a/docker/influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile
index 83d6ad55..2989f631 100644
--- a/docker/influxdb/Dockerfile
+++ b/docker/barometer-influxdb/Dockerfile
@@ -2,4 +2,3 @@ FROM influxdb:1.3.7
RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.8/src/types.db -O /types.db
COPY ./influxdb.conf /etc/influxdb/influxdb.conf
-
diff --git a/docker/influxdb/influxdb.conf b/docker/barometer-influxdb/influxdb.conf
index af59499b..7fee866d 100644
--- a/docker/influxdb/influxdb.conf
+++ b/docker/barometer-influxdb/influxdb.conf
@@ -28,6 +28,3 @@ typesdb = "/types.db"
[[udp]]
[continuous_queries]
-
-
-
diff --git a/docker/kafka/Dockerfile b/docker/barometer-kafka/Dockerfile
index 3e2402e4..3e2402e4 100644
--- a/docker/kafka/Dockerfile
+++ b/docker/barometer-kafka/Dockerfile
diff --git a/docker/kafka/start_kafka.sh b/docker/barometer-kafka/start_kafka.sh
index abde2d13..abde2d13 100755
--- a/docker/kafka/start_kafka.sh
+++ b/docker/barometer-kafka/start_kafka.sh
diff --git a/docker/snmp/docker-compose.yml b/docker/barometer-snmp/docker-compose.yml
index 49728c5e..49728c5e 100644
--- a/docker/snmp/docker-compose.yml
+++ b/docker/barometer-snmp/docker-compose.yml
diff --git a/docker/snmp/snmpd.conf b/docker/barometer-snmp/snmpd.conf
index b8e7e5fb..61ec1a38 100644
--- a/docker/snmp/snmpd.conf
+++ b/docker/barometer-snmp/snmpd.conf
@@ -15,4 +15,3 @@ view systemview included .1
access notConfigGroup "" any noauth exact systemview none none
master agentx
rocommunity public
-
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index b5029a45..00000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '2'
-
-services:
- influxdb:
- image: influxdb:1.3.7
- network_mode: host
- volumes:
- - /var/lib/influxdb
- - ./influxdb.conf:/etc/influxdb/influxdb.conf
- - ./types.db:/usr/share/collectd/types.db:ro
- grafana:
- image: grafana/grafana:4.6.0
- network_mode: host
- volumes:
- - /var/lib/grafana
-
diff --git a/docker/get_types_db.sh b/docker/get_types_db.sh
deleted file mode 100755
index 7b9105e3..00000000
--- a/docker/get_types_db.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2017 OPNFV
-#
-# 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.
-wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.8/src/types.db -O types.db
diff --git a/docker/influxdb.conf b/docker/influxdb.conf
deleted file mode 100644
index 69d69b18..00000000
--- a/docker/influxdb.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-
-[meta]
- dir = "/var/lib/influxdb/meta"
-
-[data]
- dir = "/var/lib/influxdb/data"
- wal-dir = "/var/lib/influxdb/wal"
-
-[coordinator]
-
-[retention]
-
-[shard-precreation]
-
-
-[monitor]
-
-
-[http]
-
-[[graphite]]
-
-[[collectd]]
-enabled = true
-typesdb = "/usr/share/collectd/types.db"
-[[opentsdb]]
-
-[[udp]]
-
-[continuous_queries]
-
-
-