From 0eb94b09bc62dced6b4697a143ff4967a89a29df Mon Sep 17 00:00:00 2001
From: Thomas Schneider <tschneider@asta.rwth-aachen.de>
Date: Sat, 20 Nov 2021 17:24:00 +0100
Subject: [PATCH] Remove comments listing available options in /etc/default/*
They changed between Debian buster and bullseye, and are likely to change again
with every Debian release. This way, we only have the diff once when initially
applying the role, and not on every release upgrade.
---
alertmanager/templates/default.j2 | 63 ---------
.../templates/prometheus-node-exporter.j2 | 123 ------------------
prometheus/templates/default-prometheus.j2 | 55 --------
3 files changed, 241 deletions(-)
diff --git a/alertmanager/templates/default.j2 b/alertmanager/templates/default.j2
index dac90e6..2e91ad7 100644
--- a/alertmanager/templates/default.j2
+++ b/alertmanager/templates/default.j2
@@ -1,65 +1,2 @@
# Set the command-line arguments to pass to the server.
ARGS="{{ prometheus_alertmanager_args }}"
-
-# The alert manager supports the following options:
-
-# --config.file="/etc/prometheus/alertmanager.yml"
-# Alertmanager configuration file name.
-# --storage.path="/var/lib/prometheus/alertmanager/"
-# Base path for data storage.
-# --data.retention=120h
-# How long to keep data for.
-# --alerts.gc-interval=30m
-# Interval between alert GC.
-# --log.level=info
-# Only log messages with the given severity or above.
-# --web.external-url=WEB.EXTERNAL-URL
-# The URL under which Alertmanager is externally reachable (for example,
-# if Alertmanager is served via a reverse proxy). Used for generating
-# relative and absolute links back to Alertmanager itself. If the URL has
-# a path portion, it will be used to prefix all HTTP endpoints served by
-# Alertmanager. If omitted, relevant URL components will be derived
-# automatically.
-# --web.route-prefix=WEB.ROUTE-PREFIX
-# Prefix for the internal routes of web endpoints. Defaults to path of
-# --web.external-url.
-# --web.listen-address=":9093"
-# Address to listen on for the web interface and API.
-# --web.ui-path="/usr/share/prometheus/alertmanager/ui/"
-# Path to static UI directory.
-# --template.default="/usr/share/prometheus/alertmanager/default.tmpl"
-# Path to default notification template.
-# --cluster.listen-address="0.0.0.0:9094"
-# Listen address for cluster.
-# --cluster.advertise-address=CLUSTER.ADVERTISE-ADDRESS
-# Explicit address to advertise in cluster.
-# --cluster.peer=CLUSTER.PEER ...
-# Initial peers (may be repeated).
-# --cluster.peer-timeout=15s
-# Time to wait between peers to send notifications.
-# --cluster.gossip-interval=200ms
-# Interval between sending gossip messages. By lowering this value (more
-# frequent) gossip messages are propagated across the cluster more
-# quickly at the expense of increased bandwidth.
-# --cluster.pushpull-interval=1m0s
-# Interval for gossip state syncs. Setting this interval lower (more
-# frequent) will increase convergence speeds across larger clusters at
-# the expense of increased bandwidth usage.
-# --cluster.tcp-timeout=10s Timeout for establishing a stream connection
-# with a remote node for a full state sync, and for stream read and write
-# operations.
-# --cluster.probe-timeout=500ms
-# Timeout to wait for an ack from a probed node before assuming it is
-# unhealthy. This should be set to 99-percentile of RTT (round-trip time)
-# on your network.
-# --cluster.probe-interval=1s
-# Interval between random node probes. Setting this lower (more frequent)
-# will cause the cluster to detect failed nodes more quickly at the
-# expense of increased bandwidth usage.
-# --cluster.settle-timeout=1m0s
-# Maximum time to wait for cluster connections to settle before
-# evaluating notifications.
-# --cluster.reconnect-interval=10s
-# Interval between attempting to reconnect to lost peers.
-# --cluster.reconnect-timeout=6h0m0s
-# Length of time to attempt to reconnect to a lost peer.
diff --git a/node_exporter/templates/prometheus-node-exporter.j2 b/node_exporter/templates/prometheus-node-exporter.j2
index 870cfcb..58cc4b3 100644
--- a/node_exporter/templates/prometheus-node-exporter.j2
+++ b/node_exporter/templates/prometheus-node-exporter.j2
@@ -3,126 +3,3 @@
# them (\\d for \d). If running under systemd, you need to double them again
# (\\\\d to mean \d), and escape newlines too.
ARGS="{{ node_exporter_args }}"
-
-# Prometheus-node-exporter supports the following options:
-#
-# --collector.diskstats.ignored-devices="^(ram|loop|fd|(h|s|v|xv)d[a-z]|nvme\\d+n\\d+p)\\d+$"
-# Regexp of devices to ignore for diskstats.
-# --collector.filesystem.ignored-mount-points="^/(dev|proc|run|sys|mnt|media|var/lib/docker)($|/)"
-# Regexp of mount points to ignore for filesystem
-# collector.
-# --collector.filesystem.ignored-fs-types="^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"
-# Regexp of filesystem types to ignore for
-# filesystem collector.
-# --collector.netdev.ignored-devices="^lo$"
-# Regexp of net devices to ignore for netdev
-# collector.
-# --collector.netstat.fields="^(.*_(InErrors|InErrs)|Ip_Forwarding|Ip(6|Ext)_(InOctets|OutOctets)|Icmp6?_(InMsgs|OutMsgs)|TcpExt_(Listen.*|Syncookies.*)|Tcp_(ActiveOpens|PassiveOpens|RetransSegs|CurrEstab)|Udp6?_(InDatagrams|OutDatagrams|NoPorts))$"
-# Regexp of fields to return for netstat
-# collector.
-# --collector.ntp.server="127.0.0.1"
-# NTP server to use for ntp collector
-# --collector.ntp.protocol-version=4
-# NTP protocol version
-# --collector.ntp.server-is-local
-# Certify that collector.ntp.server address is the
-# same local host as this collector.
-# --collector.ntp.ip-ttl=1 IP TTL to use while sending NTP query
-# --collector.ntp.max-distance=3.46608s
-# Max accumulated distance to the root
-# --collector.ntp.local-offset-tolerance=1ms
-# Offset between local clock and local ntpd time
-# to tolerate
-# --path.procfs="/proc" procfs mountpoint.
-# --path.sysfs="/sys" sysfs mountpoint.
-# --collector.qdisc.fixtures=""
-# test fixtures to use for qdisc collector
-# end-to-end testing
-# --collector.runit.servicedir="/etc/service"
-# Path to runit service directory.
-# --collector.supervisord.url="http://localhost:9001/RPC2"
-# XML RPC endpoint.
-# --collector.systemd.unit-whitelist=".+"
-# Regexp of systemd units to whitelist. Units must
-# both match whitelist and not match blacklist to
-# be included.
-# --collector.systemd.unit-blacklist=".+(\\.device|\\.scope|\\.slice|\\.target)"
-# Regexp of systemd units to blacklist. Units must
-# both match whitelist and not match blacklist to
-# be included.
-# --collector.systemd.private
-# Establish a private, direct connection to
-# systemd without dbus.
-# --collector.textfile.directory="/var/lib/prometheus/node-exporter"
-# Directory to read text files with metrics from.
-# --collector.vmstat.fields="^(oom_kill|pgpg|pswp|pg.*fault).*"
-# Regexp of fields to return for vmstat collector.
-# --collector.wifi.fixtures=""
-# test fixtures to use for wifi collector metrics
-# --collector.arp Enable the arp collector (default: enabled).
-# --collector.bcache Enable the bcache collector (default: enabled).
-# --collector.bonding Enable the bonding collector (default: enabled).
-# --collector.buddyinfo Enable the buddyinfo collector (default:
-# disabled).
-# --collector.conntrack Enable the conntrack collector (default:
-# enabled).
-# --collector.cpu Enable the cpu collector (default: enabled).
-# --collector.diskstats Enable the diskstats collector (default:
-# enabled).
-# --collector.drbd Enable the drbd collector (default: disabled).
-# --collector.edac Enable the edac collector (default: enabled).
-# --collector.entropy Enable the entropy collector (default: enabled).
-# --collector.filefd Enable the filefd collector (default: enabled).
-# --collector.filesystem Enable the filesystem collector (default:
-# enabled).
-# --collector.hwmon Enable the hwmon collector (default: enabled).
-# --collector.infiniband Enable the infiniband collector (default:
-# enabled).
-# --collector.interrupts Enable the interrupts collector (default:
-# disabled).
-# --collector.ipvs Enable the ipvs collector (default: enabled).
-# --collector.ksmd Enable the ksmd collector (default: disabled).
-# --collector.loadavg Enable the loadavg collector (default: enabled).
-# --collector.logind Enable the logind collector (default: disabled).
-# --collector.mdadm Enable the mdadm collector (default: enabled).
-# --collector.meminfo Enable the meminfo collector (default: enabled).
-# --collector.meminfo_numa Enable the meminfo_numa collector (default:
-# disabled).
-# --collector.mountstats Enable the mountstats collector (default:
-# disabled).
-# --collector.netdev Enable the netdev collector (default: enabled).
-# --collector.netstat Enable the netstat collector (default: enabled).
-# --collector.nfs Enable the nfs collector (default: enabled).
-# --collector.nfsd Enable the nfsd collector (default: enabled).
-# --collector.ntp Enable the ntp collector (default: disabled).
-# --collector.qdisc Enable the qdisc collector (default: disabled).
-# --collector.runit Enable the runit collector (default: disabled).
-# --collector.sockstat Enable the sockstat collector (default:
-# enabled).
-# --collector.stat Enable the stat collector (default: enabled).
-# --collector.supervisord Enable the supervisord collector (default:
-# disabled).
-# --collector.systemd Enable the systemd collector (default: enabled).
-# --collector.tcpstat Enable the tcpstat collector (default:
-# disabled).
-# --collector.textfile Enable the textfile collector (default:
-# enabled).
-# --collector.time Enable the time collector (default: enabled).
-# --collector.uname Enable the uname collector (default: enabled).
-# --collector.vmstat Enable the vmstat collector (default: enabled).
-# --collector.wifi Enable the wifi collector (default: enabled).
-# --collector.xfs Enable the xfs collector (default: enabled).
-# --collector.zfs Enable the zfs collector (default: enabled).
-# --collector.timex Enable the timex collector (default: enabled).
-# --web.listen-address=":9100"
-# Address on which to expose metrics and web
-# interface.
-# --web.telemetry-path="/metrics"
-# Path under which to expose metrics.
-# --log.level="info" Only log messages with the given severity or
-# above. Valid levels: [debug, info, warn, error,
-# fatal]
-# --log.format="logger:stderr"
-# Set the log target and format. Example:
-# "logger:syslog?appname=bob&local=7" or
-# "logger:stdout?json=true"
diff --git a/prometheus/templates/default-prometheus.j2 b/prometheus/templates/default-prometheus.j2
index 8269d4b..0032cf2 100644
--- a/prometheus/templates/default-prometheus.j2
+++ b/prometheus/templates/default-prometheus.j2
@@ -1,57 +1,2 @@
# Set the command-line arguments to pass to the server.
ARGS="{{ prometheus_args }}"
-
-# Prometheus supports the following options:
-# --config.file="/etc/prometheus/prometheus.yml"
-# Prometheus configuration file path.
-# --web.listen-address="0.0.0.0:9090"
-# Address to listen on for UI, API, and telemetry.
-# --web.read-timeout=5m Maximum duration before timing out read of the
-# request, and closing idle connections.
-# --web.max-connections=512 Maximum number of simultaneous connections.
-# --web.external-url=<URL> The URL under which Prometheus is externally
-# reachable (for example, if Prometheus is served
-# via a reverse proxy). Used for generating
-# relative and absolute links back to Prometheus
-# itself. If the URL has a path portion, it will
-# be used to prefix all HTTP endpoints served by
-# Prometheus. If omitted, relevant URL components
-# will be derived automatically.
-# --web.route-prefix=<path> Prefix for the internal routes of web endpoints.
-# Defaults to path of --web.external-url.
-# --web.local-assets="/usr/share/prometheus/web/"
-# Path to static asset/templates directory.
-# --web.user-assets=<path> Path to static asset directory, available at
-# /user.
-# --web.enable-lifecycle Enable shutdown and reload via HTTP request.
-# --web.enable-admin-api Enables API endpoints for admin control actions.
-# --web.console.templates="/etc/prometheus/consoles"
-# Path to the console template directory,
-# available at /consoles.
-# --web.console.libraries="/etc/prometheus/console_libraries"
-# Path to the console library directory.
-# --storage.tsdb.path="/var/lib/prometheus/metrics2/"
-# Base path for metrics storage.
-# --storage.tsdb.min-block-duration=2h
-# Minimum duration of a data block before being
-# persisted.
-# --storage.tsdb.max-block-duration=<duration>
-# Maximum duration compacted blocks may span.
-# (Defaults to 10% of the retention period)
-# --storage.tsdb.retention=15d
-# How long to retain samples in the storage.
-# --storage.tsdb.use-lockfile
-# Create a lockfile in data directory.
-# --alertmanager.notification-queue-capacity=10000
-# The capacity of the queue for pending alert
-# manager notifications.
-# --alertmanager.timeout=10s
-# Timeout for sending alerts to Alertmanager.
-# --query.lookback-delta=5m The delta difference allowed for retrieving
-# metrics during expression evaluations.
-# --query.timeout=2m Maximum time a query may take before being
-# aborted.
-# --query.max-concurrency=20
-# Maximum number of queries executed concurrently.
-# --log.level=info Only log messages with the given severity or
-# above. One of: [debug, info, warn, error]
--
GitLab