diff --git a/files/docker-compose.yml b/files/docker-compose.yml index e1bd26c..9bb1eda 100644 --- a/files/docker-compose.yml +++ b/files/docker-compose.yml @@ -49,7 +49,7 @@ services: - postfix grafana: - image: grafana/grafana:7.0.4 + image: grafana/grafana:7.2.2 restart: always ports: - 127.0.0.1:3002:3000 @@ -59,12 +59,10 @@ services: - influxdb influxdb: - image: influxdb:1.7 + image: influxdb:1.8-alpine restart: always ports: - 127.0.0.1:8086:8086 - environment: - - INFLUXDB_REPORTING_DISABLED=true volumes: - ./volumes/influxdb:/var/lib/influxdb - ./influxdb.conf:/etc/influxdb/influxdb.conf:ro diff --git a/files/influxdb.conf b/files/influxdb.conf index 9e41635..07b5854 100644 --- a/files/influxdb.conf +++ b/files/influxdb.conf @@ -1,4 +1,4 @@ -reporting-disabled = false +reporting-disabled = true bind-address = "127.0.0.1:8088" [meta] @@ -8,148 +8,5 @@ bind-address = "127.0.0.1:8088" [data] dir = "/var/lib/influxdb/data" - index-version = "inmem" wal-dir = "/var/lib/influxdb/wal" - wal-fsync-delay = "0s" - validate-keys = false - query-log-enabled = true - cache-max-memory-size = 1073741824 - cache-snapshot-memory-size = 26214400 - cache-snapshot-write-cold-duration = "10m0s" - compact-full-write-cold-duration = "4h0m0s" - compact-throughput = 50331648 - compact-throughput-burst = 50331648 - max-series-per-database = 1000000 - max-values-per-tag = 100000 - max-concurrent-compactions = 0 - max-index-log-file-size = 1048576 - series-id-set-cache-size = 100 - series-file-max-concurrent-snapshot-compactions = 0 - trace-logging-enabled = false - tsm-use-madv-willneed = false - -[coordinator] - write-timeout = "10s" - max-concurrent-queries = 0 - query-timeout = "0s" - log-queries-after = "0s" - max-select-point = 0 - max-select-series = 0 - max-select-buckets = 0 - -[retention] - enabled = true - check-interval = "30m0s" - -[shard-precreation] - enabled = true - check-interval = "10m0s" - advance-period = "30m0s" - -[monitor] - store-enabled = true - store-database = "_internal" - store-interval = "10s" - -[subscriber] - enabled = true - http-timeout = "30s" - insecure-skip-verify = false - ca-certs = "" - write-concurrency = 40 - write-buffer-size = 1000 - -[http] - enabled = true - bind-address = ":8086" - auth-enabled = false - log-enabled = true - suppress-write-log = false - write-tracing = false - flux-enabled = false - flux-log-enabled = false - pprof-enabled = true - pprof-auth-enabled = false - debug-pprof-enabled = false - ping-auth-enabled = false - https-enabled = false - https-certificate = "/etc/ssl/influxdb.pem" - https-private-key = "" - max-row-limit = 0 - max-connection-limit = 0 - shared-secret = "" - realm = "InfluxDB" - unix-socket-enabled = false - unix-socket-permissions = "0777" - bind-socket = "/var/run/influxdb.sock" - max-body-size = 25000000 - access-log-path = "" - max-concurrent-write-limit = 0 - max-enqueued-write-limit = 0 - enqueued-write-timeout = 30000000000 - -[logging] - format = "auto" - level = "info" - suppress-logo = false - -[[graphite]] - enabled = false - bind-address = ":2003" - database = "graphite" - retention-policy = "" - protocol = "tcp" - batch-size = 5000 - batch-pending = 10 - batch-timeout = "1s" - consistency-level = "one" - separator = "." - udp-read-buffer = 0 - -[[collectd]] - enabled = false - bind-address = ":25826" - database = "collectd" - retention-policy = "" - batch-size = 5000 - batch-pending = 10 - batch-timeout = "10s" - read-buffer = 0 - typesdb = "/usr/share/collectd/types.db" - security-level = "none" - auth-file = "/etc/collectd/auth_file" - parse-multivalue-plugin = "split" - -[[opentsdb]] - enabled = false - bind-address = ":4242" - database = "opentsdb" - retention-policy = "" - consistency-level = "one" - tls-enabled = false - certificate = "/etc/ssl/influxdb.pem" - batch-size = 1000 - batch-pending = 5 - batch-timeout = "1s" - log-point-errors = true - -[[udp]] - enabled = false - bind-address = ":8089" - database = "udp" - retention-policy = "" - batch-size = 5000 - batch-pending = 10 - read-buffer = 0 - batch-timeout = "1s" - precision = "" - -[continuous_queries] - log-enabled = true - enabled = true - query-stats-enabled = false - run-interval = "1s" - -[tls] - min-version = "" - max-version = "" + \ No newline at end of file diff --git a/templates/telegraf.conf.j2 b/templates/telegraf.conf.j2 index 7b2e4e5..068a6c5 100644 --- a/templates/telegraf.conf.j2 +++ b/templates/telegraf.conf.j2 @@ -115,7 +115,7 @@ urls = ["https://grafana.yerbamate.dev/telegraf-input"] ## The target database for metrics; will be created as needed. ## For UDP url endpoint database needs to be configured on server side. -database = "yerbamate-dev" +database = "yerbamate" ## The value of this tag will be used to determine the database. If this ## tag is not set the 'database' option is used as the default.