Merge pull request #2090 from amnonh/remove_manager_agent_port

Optionally remove manager-agent port from target file
scylladb · Oct 22, 2023 · 80eeda0 · 80eeda0
2 parents bfea7dc + 5f75cba
commit 80eeda0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/prometheus-config.sh b/prometheus-config.sh
@@ -26,6 +26,9 @@ for arg; do
         (--no-cdc)
             NO_CDC="1"
             ;;
+        (--no-manager-agent-file)
+            NO_MANAGER_AGENT_FILE="1"
+            ;;
         (*) set -- "$@" "$arg"
             ;;
     esac
@@ -75,6 +78,9 @@ elif [ "$NO_CAS" = "1" ]; then
 elif [ "$NO_CDC" = "1" ]; then
     sed -i "s/ *# FILTER_METRICS.*/    - source_labels: [__name__]\\n      regex: '(.*_cdc_.*)'\\n      action: drop/g" $PWD/prometheus/build/prometheus.yml
 fi
+if [ "$NO_MANAGER_AGENT_FILE" = "1" ]; then
+    sed -i "s/ *# MANAGER_AGENT_PORT_MAPPING.*/    - source_labels: [__address__]\\n      regex:  '(.*):\\\\d+'\\n      target_label: __address__\\n      replacement: \'\$\{1\}\'\\n/g" $PWD/prometheus/build/prometheus.yml
+fi
 
 for val in "${PROMETHEUS_TARGETS[@]}"; do
     if [[ ! -f $val ]]; then

diff --git a/prometheus/prometheus.yml.template b/prometheus/prometheus.yml.template
@@ -176,6 +176,7 @@ scrape_configs:
     - files:
       - /etc/scylla.d/prometheus/targets/scylla_manager_agents.yml
   relabel_configs:
+# MANAGER_AGENT_PORT_MAPPING
     - source_labels: [__address__]
       regex:  '([^:]+)'
       target_label: __address__

diff --git a/start-all.sh b/start-all.sh
@@ -432,6 +432,7 @@ if [ -z "$TARGET_DIRECTORY" ] && [ -z "$CONSUL_ADDRESS" ]; then
     fi
 
     if [ -z $SCYLLA_MANGER_AGENT_TARGET_FILE ]; then
+       PROMETHEUS_TARGETS="$PROMETHEUS_TARGETS --no-manager-agent-file"
        SCYLLA_MANGER_AGENT_TARGET_FILE=$SCYLLA_TARGET_FILE
     fi
     if [ ! -f $NODE_TARGET_FILE ]; then