From 1b6a6b3af6fc176368a0bf1dec2afe5ab78e2152 Mon Sep 17 00:00:00 2001 From: Aroy-Art Date: Tue, 1 Jul 2025 23:34:54 +0200 Subject: [PATCH] LazyGit Config: add overridGpg: true --- Configs/LazyGit/config.yml | 1 + .../Monitioring/docker-compose.yml | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/Configs/LazyGit/config.yml b/Configs/LazyGit/config.yml index 3693923..46ab6da 100644 --- a/Configs/LazyGit/config.yml +++ b/Configs/LazyGit/config.yml @@ -2,6 +2,7 @@ gui: nerdFontsVersion: "3" git: + overrideGpg: true paging: colorArg: always pager: delta --dark --paging=never diff --git a/Docker/Docker-Compose/Monitioring/docker-compose.yml b/Docker/Docker-Compose/Monitioring/docker-compose.yml index 6cd99ef..ede2974 100644 --- a/Docker/Docker-Compose/Monitioring/docker-compose.yml +++ b/Docker/Docker-Compose/Monitioring/docker-compose.yml @@ -38,6 +38,59 @@ services: max-size: "200m" +############################################## +# InfluxDB 2.x +# Docs: https://docs.influxdata.com/influxdb/v2.7/ +# Docker Hub: https://hub.docker.com/_/influxdb +############################################## + influxdb: + image: influxdb:2.7 # Using 2.7 as per your previous config + container_name: influxdb_v2 + environment: + INFLUXDB_REPORTING_DISABLED: "true" + INFLUXDB_HTTP_AUTH_ENABLED: "true" # This setting is primarily for the InfluxDB 1.x compatibility API + + # --- InfluxDB 2.x Initialization Environment Variables --- + # These variables will initialize the InfluxDB instance on first startup. + # They will be ignored on subsequent startups if initialization has already occurred. + INFLUXDB_INIT_MODE: setup + INFLUXDB_INIT_USERNAME: "Aroy" + INFLUXDB_INIT_PASSWORD: "Ds2agYKwwBS3kzX" + INFLUXDB_INIT_ORG: "Main" # Corresponds to your old `--org Main` + INFLUXDB_INIT_BUCKET: "Main-Bucket" # Corresponds to your old `--bucket Main-Bucket` + INFLUXDB_INIT_ADMIN_TOKEN: "mysecretinittoken" # IMPORTANT: Choose a strong, unique token here. + # This is the actual value of the token, not just a name. + # This token will have all-access to the new org/bucket. + # Store this securely. + + # The INFLUXDB_USER and INFLUXDB_DB variables below are primarily for + # compatibility with the InfluxDB 1.x compatibility API. + # If your primary data sources use the InfluxDB 2.x API (tokens), + # these are less critical for core functionality but good for compatibility. + INFLUXDB_USER: "pfsense" + INFLUXDB_USER_PASSWORD: "E6oyiFqGaFzpuQ84" + INFLUXDB_DB: "pfsense" # This will set up a DB/Retention Policy for the 1.x compatibility API. + # Data written via 1.x API to this DB will go to a bucket named "pfsense" + + volumes: + # Persistent storage for InfluxDB 2.x data and configuration + - ${BASE_DIR:-.}/InfluxDB2/Data:/var/lib/influxdb2 + - ${BASE_DIR:-.}/InfluxDB2/Config:/etc/influxdb2 + ports: + - "8086:8086" + restart: unless-stopped + healthcheck: # Added a healthcheck for better dependency management + test: ["CMD", "curl", "-f", "http://localhost:8086/health"] + interval: 10s + timeout: 5s + retries: 5 + logging: + driver: loki + options: + loki-url: "http://loki:3100/loki/api/v1/push" + max-size: "200m" + + ############################################## # Graphite # URL: https://graphite.readthedocs.io/en/stable/ @@ -128,3 +181,16 @@ services: options: loki-url: "http://localhost:3100/loki/api/v1/push" max-size: "200m" + + +############################################## +# Telegraf +# +############################################## + telegraf: + build: + context: . + dockerfile: Dockerfile.telegraf + volumes: + - ${} + restart: unless-stopped