aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/barometer-grafana/Dockerfile (renamed from docker/grafana/Dockerfile)0
-rwxr-xr-xdocker/barometer-grafana/configure_grafana.sh (renamed from docker/grafana/configure_grafana.sh)0
-rw-r--r--docker/barometer-grafana/dashboards/average_load_dashboard.json (renamed from docker/grafana/dashboards/average_load_dashboard.json)0
-rwxr-xr-xdocker/barometer-grafana/dashboards/configure_grafana.sh (renamed from docker/grafana/dashboards/configure_grafana.sh)0
-rw-r--r--docker/barometer-grafana/dashboards/cpu_usage_dashboard.json (renamed from docker/grafana/dashboards/cpu_usage_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/host_overview_dashboard.json (renamed from docker/grafana/dashboards/host_overview_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/hugepages_dashboard.json (renamed from docker/grafana/dashboards/hugepages_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/intel_pmu_dashboard.json (renamed from docker/grafana/dashboards/intel_pmu_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/intel_rdt_dashboard.json (renamed from docker/grafana/dashboards/intel_rdt_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/ipmi_dashboard.json (renamed from docker/grafana/dashboards/ipmi_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/mcelog_dashboard.json (renamed from docker/grafana/dashboards/mcelog_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/ovs_stats_dashboard.json (renamed from docker/grafana/dashboards/ovs_stats_dashboard.json)0
-rw-r--r--docker/barometer-grafana/dashboards/virt_dashboard.json (renamed from docker/grafana/dashboards/virt_dashboard.json)0
-rw-r--r--docker/barometer-grafana/run.sh (renamed from docker/grafana/run.sh)0
-rw-r--r--docs/release/userguide/docker.userguide.rst96
15 files changed, 33 insertions, 63 deletions
diff --git a/docker/grafana/Dockerfile b/docker/barometer-grafana/Dockerfile
index 32a78862..32a78862 100644
--- a/docker/grafana/Dockerfile
+++ b/docker/barometer-grafana/Dockerfile
diff --git a/docker/grafana/configure_grafana.sh b/docker/barometer-grafana/configure_grafana.sh
index 0b185297..0b185297 100755
--- a/docker/grafana/configure_grafana.sh
+++ b/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
index ae797f75..ae797f75 100644
--- a/docker/grafana/dashboards/average_load_dashboard.json
+++ b/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
index 8ce9689b..8ce9689b 100755
--- a/docker/grafana/dashboards/configure_grafana.sh
+++ b/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
index c9509fa0..c9509fa0 100644
--- a/docker/grafana/dashboards/cpu_usage_dashboard.json
+++ b/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
index e6d3ad95..e6d3ad95 100644
--- a/docker/grafana/dashboards/host_overview_dashboard.json
+++ b/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
index 146fccf4..146fccf4 100644
--- a/docker/grafana/dashboards/hugepages_dashboard.json
+++ b/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
index e1fad5fa..e1fad5fa 100644
--- a/docker/grafana/dashboards/intel_pmu_dashboard.json
+++ b/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
index 49efec7a..49efec7a 100644
--- a/docker/grafana/dashboards/intel_rdt_dashboard.json
+++ b/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
index 04179ef6..04179ef6 100644
--- a/docker/grafana/dashboards/ipmi_dashboard.json
+++ b/docker/barometer-grafana/dashboards/ipmi_dashboard.json
diff --git a/docker/grafana/dashboards/mcelog_dashboard.json b/docker/barometer-grafana/dashboards/mcelog_dashboard.json
index 9618bacc..9618bacc 100644
--- a/docker/grafana/dashboards/mcelog_dashboard.json
+++ b/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
index 34c8b7bf..34c8b7bf 100644
--- a/docker/grafana/dashboards/ovs_stats_dashboard.json
+++ b/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
index 5317b701..5317b701 100644
--- a/docker/grafana/dashboards/virt_dashboard.json
+++ b/docker/barometer-grafana/dashboards/virt_dashboard.json
diff --git a/docker/grafana/run.sh b/docker/barometer-grafana/run.sh
index 5b9a8191..5b9a8191 100644
--- a/docker/grafana/run.sh
+++ b/docker/barometer-grafana/run.sh
diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst
index be9f6cae..fe0ea5ac 100644
--- 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
^^^^^^^^^^^^^^^^^^^^^^^^