Skip to content

Commit e18d6c5

Browse files
committed
Revert most changes
1 parent 48decde commit e18d6c5

21 files changed

+5
-6401
lines changed

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,8 @@ The default credentials are:
7979
## Documentation
8080

8181
Please refer [to our wiki on Github][netbox-docker-wiki] for further information on how to use this Netbox Docker image properly.
82-
You'll learn how to read the integrated metrics using [Prometheus][prometheus] and [Grafana][grafana].
83-
It also covers advanced topics such as using secret files, deployment to Kubernetes as well as NAPALM and LDAP configuration.
82+
It covers advanced topics such as using files for secrets, deployment to Kubernetes and configuring NAPALM or LDAP.
8483

85-
[prometheus]: https://prometheus.io/
86-
[grafana]: https://grafana.com/grafana/
8784
[netbox-docker-wiki]: https://github.com/netbox-community/netbox-docker/wiki/
8885

8986
## Getting Help

docker-compose.monitoring.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
- sh
3737
- -c # this is to evaluate the $REDIS_PASSWORD from the env
3838
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
39-
env_file: env/redis-worker.env
39+
env_file: env/redis.env
4040
redis-cache:
4141
image: redis:6-alpine
4242
command:

docker-compose.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ services:
1818
- netbox-nginx-config:/etc/netbox-nginx:z
1919
- netbox-static-files:/opt/netbox/netbox/static:z
2020
- netbox-media-files:/opt/netbox/netbox/media:z
21-
- type: tmpfs
22-
target: /tmp/metrics
23-
read_only: false
2421
netbox-worker:
2522
<<: *netbox
2623
depends_on:
@@ -57,15 +54,15 @@ services:
5754
- sh
5855
- -c # this is to evaluate the $REDIS_PASSWORD from the env
5956
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
60-
env_file: env/redis-worker.env
57+
env_file: env/redis.env
6158
volumes:
6259
- netbox-redis-data:/data
6360
redis-cache:
6461
image: redis:6-alpine
6562
command:
6663
- sh
6764
- -c # this is to evaluate the $REDIS_PASSWORD from the env
68-
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
65+
- redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
6966
env_file: env/redis-cache.env
7067

7168
volumes:

env/grafana.env

Lines changed: 0 additions & 3 deletions
This file was deleted.

env/netbox.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EMAIL_SSL_CERTFILE=
1616
EMAIL_SSL_KEYFILE=
1717
MAX_PAGE_SIZE=1000
1818
MEDIA_ROOT=/opt/netbox/netbox/media
19-
METRICS_ENABLED=true
19+
METRICS_ENABLED=false
2020
NAPALM_USERNAME=
2121
NAPALM_PASSWORD=
2222
NAPALM_TIMEOUT=10

env/postgres-exporter.env

Lines changed: 0 additions & 4 deletions
This file was deleted.

env/redis-cache-exporter.env

Lines changed: 0 additions & 2 deletions
This file was deleted.

env/redis-worker-exporter.env

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)