Merge branch 'production'

ukwa · Feb 26, 2020 · c3acb59 · c3acb59
2 parents 36da070 + 37f036e
commit c3acb59
Show file tree

Hide file tree

Showing 106 changed files with 14,129 additions and 8,632 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 # ukwa-monitor
 Dashboard and monitoring system for the UK Web Archive
 
-Currently has `reporting` and `metrics` but the latter will move to `ukwa-ingest-services` eventually.
+__Note__
+Default organisation name used within Grafana still needs to be set manually via the Grafana UI. 
+See https://github.com/grafana/grafana/issues/2908 for details/progress.
diff --git a/hdfs_exporter/Dockerfile b/hdfs_exporter/Dockerfile
diff --git a/hdfs_exporter/README.md b/hdfs_exporter/README.md
diff --git a/hdfs_exporter/docker-compose.yml b/hdfs_exporter/docker-compose.yml
diff --git a/hdfs_exporter/requirements.txt b/hdfs_exporter/requirements.txt
diff --git a/hdfs_exporter/setup.py b/hdfs_exporter/setup.py
diff --git a/hdfs_exporter/webapp.py b/hdfs_exporter/webapp.py
diff --git a/heritrix3_exporter/Dockerfile b/heritrix3_exporter/Dockerfile
diff --git a/heritrix3_exporter/README.md b/heritrix3_exporter/README.md