diff --git a/roles/alpina/collections/services/monitoring/app_config.yml b/roles/alpina/collections/services/monitoring/app_config.yml index 9726b00..2ca2d5e 100644 --- a/roles/alpina/collections/services/monitoring/app_config.yml +++ b/roles/alpina/collections/services/monitoring/app_config.yml @@ -1,10 +1,15 @@ $ANSIBLE_VAULT;1.2;AES256;alpina -39396231313035346438656264623739653031313965353037666664316465356236363065663766 -6462643462653662643166376165643862333562316462650a393339663065653239353263653833 -30316237373738386637633532356333666230626438303332346234376135363165356239666234 -3630633432626635380a396237343633633961653762323431383838366337383966376235663533 -63616530636231393965366461383261623066396662346637373264353265303464323037666435 -62326433646336353236616335616336383035643331613131626266373439623761336337303465 -63613334366164666330613330306531383531616564323965636461626139663137653863663362 -30303162633730363866376562633366326632646466656663396361333132633638333165366532 -3339 \ No newline at end of file +66386535313437306461333238623131623734376539643632333632373636306662653731393565 +3038663166396536643834646131663765633264353533370a633331383631313235353430373763 +61636665643539313232343964313536333134326661633263643032316262333238616638323866 +3839633561613937660a373435383534356164396663383262306633333837373930633162666231 +30396334353130393335393061376335623335383631623866633962373930636331663365666131 +38633830396237363436393061663435616165393137333634613265396136353232306465333731 +38623161373232386664323338636261343537313761623439636136366432323835363936316265 +66666462623032316631306333336435643062303134656332323630313639613436643136666130 +36663166623935373466353438613839663237633765343164303237646261313038383530613930 +38303533346337653237326236326132373939376435346564363939353231626434663537613764 +61653866366165393066643837643835643265656634633162623562386563326438393430303530 +64366635366361653434313234613737666464336361656336653639343336393661656662393434 +32666264373637613566623136623037383263346237353866323434313061393433396664336335 +3633383430623238656465643465663763323864626134393331 \ No newline at end of file diff --git a/roles/alpina/collections/services/monitoring/templates/.env.influxdb.j2 b/roles/alpina/collections/services/monitoring/templates/.env.influxdb.j2 new file mode 100644 index 0000000..95eaab8 --- /dev/null +++ b/roles/alpina/collections/services/monitoring/templates/.env.influxdb.j2 @@ -0,0 +1,7 @@ +DOCKER_INFLUXDB_INIT_MODE=setup +DOCKER_INFLUXDB_INIT_ORG=home +DOCKER_INFLUXDB_INIT_BUCKET=influx +DOCKER_INFLUXDB_INIT_USERNAME=CaZzzer +DOCKER_INFLUXDB_INIT_PASSWORD={{ influxdb_admin_password }} +DOCKER_INFLUXDB_INIT_ADMIN_TOKEN={{ influxdb_admin_token }} +DOCKER_INFLUXDB_INIT_RETENTION=1w diff --git a/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2 b/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2 index 7fe0f77..52de078 100644 --- a/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2 +++ b/roles/alpina/collections/services/monitoring/templates/docker-compose.yml.j2 @@ -58,8 +58,23 @@ services: image: prom/prometheus:latest container_name: prometheus restart: unless-stopped + # Needed to make config files readable user: "{{ remote_uid }}" volumes: - ./prometheus_config:/etc/prometheus:ro - {{ base_volume_path }}/monitoring/prometheus_configs:/etc/prometheus/extra:ro - {{ base_volume_path }}/monitoring/prometheus:/prometheus + + influxdb: + image: influxdb:2.7-alpine + container_name: influxdb + labels: + - {{ helpers.traefik_labels('influxdb', port='8086') | indent(6) }} + restart: unless-stopped + env_file: + - .env.influxdb + networks: + - default + - traefik_traefik + volumes: + - {{ base_volume_path }}/monitoring/influxdb:/var/lib/influxdb2 diff --git a/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2 b/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2 index fe427ad..2ce42bf 100644 --- a/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2 +++ b/roles/alpina/collections/services/monitoring/templates/grafana_config/provisioning/datasources/alpina.yaml.j2 @@ -3,7 +3,6 @@ apiVersion: 1 datasources: - name: Loki type: loki - version: 1 access: proxy uid: loki url: http://loki:3100 @@ -11,8 +10,20 @@ datasources: - name: Prometheus type: prometheus - version: 1 access: proxy uid: prometheus url: http://prometheus:9090 editable: false + + - name: InfluxDB + type: influxdb + access: proxy + uid: influxdb + url: http://influxdb:8086 + jsonData: + version: Flux + organization: home + defaultBucket: influx + secureJsonData: + token: {{ influxdb_admin_token }} + editable: false