DLPX-96312 Resolved review comments

Author: dbshah12

debian/control

@@ -13,6 +13,6 @@ Standards-Version: 4.1.2
 
 Package: performance-diagnostics
 Architecture: any
-Depends: python3-bpfcc, python3-minimal, python3-psutil, telegraf, docker.io, influxdb2
+Depends: python3-bpfcc, python3-minimal, python3-psutil, telegraf, docker.io, influxdb2, curl, openssl
 Description: eBPF-based Performance Diagnostic Tools
   A collection of eBPF-based tools for diagnosing performance issues.

influxdb/delphix-influxdb-init

@@ -2,8 +2,6 @@
 #
 # Copyright (c) 2026 by Delphix. All rights reserved.
 #
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
 # One-time InfluxDB initialization: creates org, bucket, admin token,
 # a read-only token for DCT Smart Proxy, and appends the
 # [[outputs.influxdb_v2]] stanza to /etc/telegraf/telegraf.base.
@@ -26,7 +24,7 @@ INFLUXDB_INIT_CONF="$INFLUXDB_CONFIG_DIR/influxdb-init.conf"
 source "$INFLUXDB_INIT_CONF"
 
 INFLUXDB_ADMIN_USER="admin"
-INFLUXDB_ADMIN_PASSWORD="$(openssl rand -hex 16)"
+INFLUXDB_ADMIN_PASSWORD=""
 
 #
 # Log a message to stderr with a timestamp.
@@ -102,12 +100,15 @@ if [[ -f "$INFLUXDB_SETUP_STATE_FILE" ]]; then
 		key="${line%%=*}"
 		value="${line#*=}"
 		case "$key" in
-			ADMIN_TOKEN) ADMIN_TOKEN="$value" ;;
-			ORG_ID)      ORG_ID="$value" ;;
-			BUCKET_ID)   BUCKET_ID="$value" ;;
+			ADMIN_TOKEN)          ADMIN_TOKEN="$value" ;;
+			ORG_ID)               ORG_ID="$value" ;;
+			BUCKET_ID)            BUCKET_ID="$value" ;;
+			INFLUXDB_ADMIN_PASSWORD) INFLUXDB_ADMIN_PASSWORD="$value" ;;
 		esac
 	done <"$INFLUXDB_SETUP_STATE_FILE"
 else
+	# Generate password only when actually running setup for the first time.
+	INFLUXDB_ADMIN_PASSWORD="$(openssl rand -hex 16)"
 	SETUP_RESPONSE=$(influx_post "/api/v2/setup" "{
 		\"username\": \"$INFLUXDB_ADMIN_USER\",
 		\"password\": \"$INFLUXDB_ADMIN_PASSWORD\",
@@ -120,13 +121,14 @@ else
 	ORG_ID=$(json_field "$SETUP_RESPONSE" "['org']['id']") || exit 1
 	BUCKET_ID=$(json_field "$SETUP_RESPONSE" "['bucket']['id']") || exit 1
 
-	# Persist admin token + IDs immediately so a subsequent re-run can resume
-	# without repeating the one-shot setup call.
+	# Persist admin token + IDs + password immediately so a subsequent re-run
+	# can resume without repeating the one-shot setup call, and so the password
+	# stored in influxdb_meta always matches what InfluxDB was initialised with.
 	old_umask="$(umask)"
 	umask 077
 	tmp_state="$(mktemp "${INFLUXDB_SETUP_STATE_FILE}.XXXXXX")"
-	printf 'ADMIN_TOKEN=%s\nORG_ID=%s\nBUCKET_ID=%s\n' \
-		"$ADMIN_TOKEN" "$ORG_ID" "$BUCKET_ID" >"$tmp_state"
+	printf 'ADMIN_TOKEN=%s\nORG_ID=%s\nBUCKET_ID=%s\nINFLUXDB_ADMIN_PASSWORD=%s\n' \
+		"$ADMIN_TOKEN" "$ORG_ID" "$BUCKET_ID" "$INFLUXDB_ADMIN_PASSWORD" >"$tmp_state"
 	chmod 600 "$tmp_state"
 	mv "$tmp_state" "$INFLUXDB_SETUP_STATE_FILE"
 	umask "$old_umask"

influxdb/delphix-influxdb-service

@@ -2,8 +2,6 @@
 #
 # Copyright (c) 2026 by Delphix. All rights reserved.
 #
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
 # Wrapper script to start InfluxDB 2.x and run first-time initialization.
 #
 

influxdb/influxdb-init.conf

@@ -1,8 +1,6 @@
 #
 # Copyright (c) 2026 by Delphix. All rights reserved.
 #
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
 # Configuration for delphix-influxdb-init.
 # Sourced by /usr/bin/delphix-influxdb-init at runtime.
 #

influxdb/influxdb.conf

@@ -1,12 +1,10 @@
 #
 # Copyright 2024 Delphix. All rights reserved.
 #
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
 # InfluxDB 2.x Configuration
 #
 
-bolt-path = "/var/lib/influxdb2/influxdb.bolt"
-engine-path = "/var/lib/influxdb2/engine"
+bolt-path = "/var/lib/influxdb/influxd.bolt"
+engine-path = "/var/lib/influxdb/engine"
 http-bind-address = "127.0.0.1:8086"
 log-level = "warn"

influxdb/perf_influxdb

@@ -2,8 +2,6 @@
 #
 # Copyright (c) 2026 by Delphix. All rights reserved.
 #
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
 # Script that enables and disables InfluxDB metric output for Telegraf.
 #