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>

diff --git a/docker/influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile
similarity index 99%
rename from docker/influxdb/Dockerfile
rename to docker/barometer-influxdb/Dockerfile
index 83d6ad5..2989f63 100644 (file)
--- 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
similarity index 99%
rename from docker/influxdb/influxdb.conf
rename to docker/barometer-influxdb/influxdb.conf
index af59499..7fee866 100644 (file)
--- 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
similarity index 100%
rename from docker/kafka/Dockerfile
rename to docker/barometer-kafka/Dockerfile

diff --git a/docker/kafka/start_kafka.sh b/docker/barometer-kafka/start_kafka.sh
similarity index 100%
rename from docker/kafka/start_kafka.sh
rename to docker/barometer-kafka/start_kafka.sh

diff --git a/docker/snmp/docker-compose.yml b/docker/barometer-snmp/docker-compose.yml
similarity index 100%
rename from docker/snmp/docker-compose.yml
rename to docker/barometer-snmp/docker-compose.yml

diff --git a/docker/snmp/snmpd.conf b/docker/barometer-snmp/snmpd.conf
similarity index 99%
rename from docker/snmp/snmpd.conf
rename to docker/barometer-snmp/snmpd.conf
index b8e7e5f..61ec1a3 100644 (file)
--- 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 (file)
index b5029a4..0000000
--- 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 (executable)
index 7b9105e..0000000
--- 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 (file)
index 69d69b1..0000000
--- 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]
-
-
-