docker: rename grafana directory

Rename the grafana directory to barometer-grafana and remove references to
docker compose from the documentation till we have a new barometer docker
compose file.

Change-Id: I4f64a6c10a146a39549380bb33837ae7c39cac2a
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/docker/grafana/Dockerfile b/docker/barometer-grafana/Dockerfile
similarity index 100%
rename from docker/grafana/Dockerfile
rename to docker/barometer-grafana/Dockerfile

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

diff --git a/docker/grafana/dashboards/average_load_dashboard.json b/docker/barometer-grafana/dashboards/average_load_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/average_load_dashboard.json
rename to docker/barometer-grafana/dashboards/average_load_dashboard.json

diff --git a/docker/grafana/dashboards/configure_grafana.sh b/docker/barometer-grafana/dashboards/configure_grafana.sh
similarity index 100%
rename from docker/grafana/dashboards/configure_grafana.sh
rename to docker/barometer-grafana/dashboards/configure_grafana.sh

diff --git a/docker/grafana/dashboards/cpu_usage_dashboard.json b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/cpu_usage_dashboard.json
rename to docker/barometer-grafana/dashboards/cpu_usage_dashboard.json

diff --git a/docker/grafana/dashboards/host_overview_dashboard.json b/docker/barometer-grafana/dashboards/host_overview_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/host_overview_dashboard.json
rename to docker/barometer-grafana/dashboards/host_overview_dashboard.json

diff --git a/docker/grafana/dashboards/hugepages_dashboard.json b/docker/barometer-grafana/dashboards/hugepages_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/hugepages_dashboard.json
rename to docker/barometer-grafana/dashboards/hugepages_dashboard.json

diff --git a/docker/grafana/dashboards/intel_pmu_dashboard.json b/docker/barometer-grafana/dashboards/intel_pmu_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/intel_pmu_dashboard.json
rename to docker/barometer-grafana/dashboards/intel_pmu_dashboard.json

diff --git a/docker/grafana/dashboards/intel_rdt_dashboard.json b/docker/barometer-grafana/dashboards/intel_rdt_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/intel_rdt_dashboard.json
rename to docker/barometer-grafana/dashboards/intel_rdt_dashboard.json

diff --git a/docker/grafana/dashboards/ipmi_dashboard.json b/docker/barometer-grafana/dashboards/ipmi_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/ipmi_dashboard.json
rename to docker/barometer-grafana/dashboards/ipmi_dashboard.json

diff --git a/docker/grafana/dashboards/mcelog_dashboard.json b/docker/barometer-grafana/dashboards/mcelog_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/mcelog_dashboard.json
rename to docker/barometer-grafana/dashboards/mcelog_dashboard.json

diff --git a/docker/grafana/dashboards/ovs_stats_dashboard.json b/docker/barometer-grafana/dashboards/ovs_stats_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/ovs_stats_dashboard.json
rename to docker/barometer-grafana/dashboards/ovs_stats_dashboard.json

diff --git a/docker/grafana/dashboards/virt_dashboard.json b/docker/barometer-grafana/dashboards/virt_dashboard.json
similarity index 100%
rename from docker/grafana/dashboards/virt_dashboard.json
rename to docker/barometer-grafana/dashboards/virt_dashboard.json

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

diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst
index be9f6ca..fe0ea5a 100644 (file)
--- a/docs/release/userguide/docker.userguide.rst
+++ b/docs/release/userguide/docker.userguide.rst
@@ -291,69 +291,6 @@ Check your docker image is running
 
 Build the influxdb + Grafana docker images
 ------------------------------------------
-
-
-Install docker-compose
-^^^^^^^^^^^^^^^^^^^^^^
-
-On the node where you want to run influxdb + grafana:
-1. Start by installing docker compose
-
-.. code:: bash
-
-   $ sudo curl -L https://github.com/docker/compose/releases/download/1.17.0/docker-compose-`uname -s`-`uname -m` -o /usr/bin/docker-compose
-
-.. note::
-  Use the latest Compose release number in the download command. The above command is an example,
-  and it may become out-of-date. To ensure you have the latest version, check the Compose repository
-  release page on GitHub.
-
-2. Apply executable permissions to the binary:
-
-.. code:: bash
-
-   $ sudo chmod +x /usr/bin/docker-compose
-
-3. Test the installation.
-
-.. code:: bash
-
-  $ sudo docker-compose --version
-
-
-Download the InfluxDB and Grafana docker image
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you wish to use pre-built barometer project's influxdb and grafana images, you can pull the
-images from https://hub.docker.com/r/opnfv/barometer-influxdb/ and https://hub.docker.com/r/opnfv/barometer-grafana/
-
-.. note::
- If your preference is to build images locally please see sections `Build the InfluxDB Image`_ and
- `Build the Grafana Image`_
-
-.. code:: bash
-
-    $ docker pull opnfv/barometer-influxdb
-    $ docker pull opnfv/barometer-grafana
-
-Run the Influxdb and Grafana Images
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Launch containers:
-
-.. code:: bash
-
-   $ cd barometer/docker/
-   $ sudo docker-compose up -d
-
-Check your docker images are running
-
-.. code:: bash
-
-   $ sudo docker ps
-
-Connect to <host_ip>:3000 with a browser and log into grafana: admin/admin
-
-
 Build the InfluxDB Image
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -410,6 +347,39 @@ Output should contain an influxdb image:
    REPOSITORY             TAG                 IMAGE ID            CREATED             SIZE
    barometer-grafana      latest              05f2a3edd96b        3 hours ago         1.2GB
 
+
+Download the InfluxDB and Grafana docker image
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If you wish to use pre-built barometer project's influxdb and grafana images, you can pull the
+images from https://hub.docker.com/r/opnfv/barometer-influxdb/ and https://hub.docker.com/r/opnfv/barometer-grafana/
+
+.. note::
+ If your preference is to build images locally please see sections `Build the InfluxDB Image`_ and
+ `Build the Grafana Image`_
+
+.. code:: bash
+
+    $ docker pull opnfv/barometer-influxdb
+    $ docker pull opnfv/barometer-grafana
+
+Run the Influxdb and Grafana Images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Launch containers:
+
+.. code:: bash
+
+   $ cd barometer/docker/
+   $ sudo docker-compose up -d
+
+Check your docker images are running
+
+.. code:: bash
+
+   $ sudo docker ps
+
+Connect to <host_ip>:3000 with a browser and log into grafana: admin/admin
+
 Testing the docker image
 ^^^^^^^^^^^^^^^^^^^^^^^^