Revert most changes

netbox-community · Oct 26, 2020 · 21dc7c3 · 21dc7c3
1 parent 4f49a8e
commit 21dc7c3
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 6,401 deletions.
diff --git a/README.md b/README.md
@@ -79,11 +79,8 @@ The default credentials are:
 ## Documentation
 
 Please refer [to our wiki on Github][netbox-docker-wiki] for further information on how to use this Netbox Docker image properly.
-You'll learn how to read the integrated metrics using [Prometheus][prometheus] and [Grafana][grafana].
-It also covers advanced topics such as using secret files, deployment to Kubernetes as well as NAPALM and LDAP configuration.
+It covers advanced topics such as using files for secrets, deployment to Kubernetes and configuring NAPALM or LDAP.
 
-[prometheus]: https://prometheus.io/
-[grafana]: https://grafana.com/grafana/
 [netbox-docker-wiki]: https://github.com/netbox-community/netbox-docker/wiki/
 
 ## Getting Help

diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -36,7 +36,7 @@ services:
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: env/redis-worker.env
+    env_file: env/redis.env
   redis-cache:
     image: redis:6-alpine
     command:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,9 +18,6 @@ services:
     - netbox-nginx-config:/etc/netbox-nginx:z
     - netbox-static-files:/opt/netbox/netbox/static:z
     - netbox-media-files:/opt/netbox/netbox/media:z
-    - type: tmpfs
-      target: /tmp/metrics
-      read_only: false
   netbox-worker:
     <<: *netbox
     depends_on:
@@ -57,15 +54,15 @@ services:
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: env/redis-worker.env
+    env_file: env/redis.env
     volumes:
     - netbox-redis-data:/data
   redis-cache:
     image: redis:6-alpine
     command:
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
-    - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
+    - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     env_file: env/redis-cache.env
 
 volumes:

diff --git a/env/grafana.env b/env/grafana.env
diff --git a/env/netbox.env b/env/netbox.env
@@ -16,7 +16,7 @@ EMAIL_SSL_CERTFILE=
 EMAIL_SSL_KEYFILE=
 MAX_PAGE_SIZE=1000
 MEDIA_ROOT=/opt/netbox/netbox/media
-METRICS_ENABLED=true
+METRICS_ENABLED=false
 NAPALM_USERNAME=
 NAPALM_PASSWORD=
 NAPALM_TIMEOUT=10

diff --git a/env/postgres-exporter.env b/env/postgres-exporter.env
diff --git a/env/redis-cache-exporter.env b/env/redis-cache-exporter.env
diff --git a/env/redis-worker-exporter.env b/env/redis-worker-exporter.env
diff --git a/env/redis-worker.env → env/redis.env b/env/redis-worker.env → env/redis.env
diff --git a/monitoring/grafana/dashboards/netbox/.keep b/monitoring/grafana/dashboards/netbox/.keep