Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipv6 safe #2137

Merged
merged 3 commits into from
Dec 20, 2023
Merged

Ipv6 safe #2137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d47b245
start-all.sh: fix a confusion between manager and node exporter targe…
amnonh Dec 20, 2023
3561ebe
prometheus.yml.template: do not mix IPv6 with port numbers
amnonh Dec 20, 2023
4e44b98
monitoring-stack.rst: port is no longer required in ipv6
amnonh Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/source/install/monitoring-stack.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@ For example:

*Using IPV6*

To use IPv6 inside scylla_server.yml, add the IPv6 addresses with their square brackets and the port numbers.
To use IPv6 inside scylla_server.yml, add the IPv6 addresses with their square brackets.

For example:

.. code-block:: yaml

- targets:
- "[2600:1f18:26b1:3a00:fac8:118e:9199:67b9]:9180"
- "[2600:1f18:26b1:3a00:fac8:118e:9199:67ba]:9180"
- "[2600:1f18:26b1:3a00:fac8:118e:9199:67b9]"
- "[2600:1f18:26b1:3a00:fac8:118e:9199:67ba]"
labels:
cluster: cluster1
dc: dc1
Expand Down
20 changes: 16 additions & 4 deletions prometheus/prometheus.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@ scrape_configs:
- /etc/scylla.d/prometheus/targets/scylla_servers.yml
relabel_configs:
- source_labels: [__address__]
regex: '([^:]+)'
regex: '(.+)([:]\d+)$'
target_label: __port__
replacement: '::'
- source_labels: [__address__, __port__]
regex: '(.+);$'
target_label: __address__
replacement: '${1}:9180'

- source_labels: [__address__]
regex: '(.*):.+'
regex: '(.*):.+$'
target_label: instance
replacement: '${1}'
metric_relabel_configs:
Expand Down Expand Up @@ -154,7 +158,11 @@ scrape_configs:
relabel_configs:
# NODE_EXPORTER_PORT_MAPPING
- source_labels: [__address__]
regex: '([^:]+)'
regex: '(.+)([:]\d+)$'
target_label: __port__
replacement: '::'
- source_labels: [__address__, __port__]
regex: '(.+);$'
target_label: __address__
replacement: '${1}:9100'
- source_labels: [__address__]
Expand All @@ -175,7 +183,11 @@ scrape_configs:
relabel_configs:
# MANAGER_AGENT_PORT_MAPPING
- source_labels: [__address__]
regex: '([^:]+)'
regex: '(.+)([:]\d+)$'
target_label: __port__
replacement: '::'
- source_labels: [__address__, __port__]
regex: '(.+);$'
target_label: __address__
replacement: '${1}:5090'
- source_labels: [__address__]
Expand Down
4 changes: 2 additions & 2 deletions start-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,12 +428,12 @@ if [ -z "$TARGET_DIRECTORY" ] && [ -z "$CONSUL_ADDRESS" ]; then
fi

if [ -z $NODE_TARGET_FILE ]; then
PROMETHEUS_TARGETS="$PROMETHEUS_TARGETS --no-manager-agent-file"
PROMETHEUS_TARGETS="$PROMETHEUS_TARGETS --no-node-exporter-file"
NODE_TARGET_FILE=$SCYLLA_TARGET_FILE
fi

if [ -z $SCYLLA_MANGER_AGENT_TARGET_FILE ]; then
PROMETHEUS_TARGETS="$PROMETHEUS_TARGETS --no-node-exporter-file"
PROMETHEUS_TARGETS="$PROMETHEUS_TARGETS --no-manager-agent-file"
SCYLLA_MANGER_AGENT_TARGET_FILE=$SCYLLA_TARGET_FILE
fi
if [ ! -f $NODE_TARGET_FILE ]; then
Expand Down