Fix for CCP configmap processing issue

.pipelines/azure-pipeline-build.yml

@@ -2,7 +2,6 @@ trigger:
   branches:
     include:
     - main
-
 pr:
   autoCancel: true
   branches:

RELEASENOTES.md

@@ -1,5 +1,11 @@
 # Azure Monitor Metrics for AKS clusters
 
+## Release 12-04-2024 (hot-fix for ccp config map issue ) - CCP release only - 
+* CCP image - 
+
+* Changelog -
+  - Fix for CCP Config map processing issue - (https://github.com/Azure/prometheus-collector/pull/1017)
+
 ## Release 10-21-2024
 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.11.0-main-10-21-2024-91ec49e3`
 * Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.11.0-main-10-21-2024-91ec49e3-win`

otelcollector/VERSION

@@ -1 +1 @@
-6.11.0
+6.12.0

otelcollector/build/linux/ccp/Dockerfile

@@ -156,9 +156,13 @@ COPY --from=builder /usr/lib/libdl.so.2 /usr/lib/librt.so.1 /usr/lib/libpthread.
 # COPY --from=builder /usr/bin/curl /usr/bin/
 # COPY --from=builder /lib/libcurl.so.4 /lib/libz.so.1 /lib/libc.so.6 /lib/libnghttp2.so.14 /lib/libssh2.so.1 /lib/libgssapi_krb5.so.2 /lib/libzstd.so.1 /lib/
 # COPY --from=builder /usr/lib/libkrb5.so.3 /usr/lib/libk5crypto.so.3 /usr/lib/libcom_err.so.2 /usr/lib/libkrb5support.so.0 /usr/lib/libresolv.so.2 /usr/lib/
+# RUN chmod 777 /opt/;
 
 # Expose the port on which the application listens
 EXPOSE 8080
 
+# Run as root to access /etc
+# USER root
+
 # Run the Go executable, entrypoint
 ENTRYPOINT ["./opt/main/ccpmain"]

otelcollector/configuration-reader-builder/main.go

@@ -245,6 +245,7 @@ func main() {
 	_, err := os.Create("/opt/inotifyoutput.txt")
 	if err != nil {
 		log.Fatalf("Error creating output file: %v\n", err)
+		fmt.Println("Error creating inotify output file:", err)
 	}
 
 	// Define the command to start inotify for config reader's liveness probe
@@ -254,7 +255,8 @@ func main() {
 		"--daemon",
 		"--recursive",
 		"--outfile", "/opt/inotifyoutput.txt",
-		"--event", "create,delete",
+		"--event", "create",
+		"--event", "delete",
 		"--format", "%e : %T",
 		"--timefmt", "+%s",
 	)
@@ -263,6 +265,7 @@ func main() {
 	err = inotifyCommandCfg.Start()
 	if err != nil {
 		log.Fatalf("Error starting inotify process for config reader's liveness probe: %v\n", err)
+		fmt.Println("Error starting inotify process:", err)
 	}
 
 	configmapsettings.Configmapparser()

otelcollector/main/main.go

@@ -17,6 +17,9 @@ import (
 )
 
 func main() {
+
+
+
 	controllerType := shared.GetControllerType()
 	cluster := shared.GetEnv("CLUSTER", "")
 	clusterOverride := shared.GetEnv("CLUSTER_OVERRIDE", "")
@@ -29,9 +32,21 @@ func main() {
 	}
 
 	if osType == "linux" {
-		outputFile := "/opt/inotifyoutput.txt"
-		if err := shared.Inotify(outputFile, "/etc/config/settings", "/etc/prometheus/certs"); err != nil {
-			log.Fatal(err)
+		outputFile := "/opt/inotifyoutput.txt" 
+
+		if ccpMetricsEnabled != "true" { //data-plane
+
+			if err := shared.Inotify(outputFile, "/etc/config/settings"); err != nil {
+				log.Fatal(err)
+			}
+
+			if err := shared.Inotify(outputFile, "/etc/prometheus/certs"); err != nil {
+				log.Fatal(err)
+			}
+		} else { //control-plane
+			if err := shared.InotifyCCP(outputFile, "/etc/config/settings"); err != nil {
+				log.Fatal(err)
+			}
 		}
 	} else if osType == "windows" {
 		fmt.Println("Starting filesystemwatcher.ps1")
@@ -213,6 +228,9 @@ func main() {
 			"--daemon",
 			"--outfile", outputFile,
 			"--event", "ATTRIB",
+			"--event", "create",
+			"--event", "delete",
+			"--event", "modify",
 			"--format", "%e : %T",
 			"--timefmt", "+%s",
 		)

otelcollector/shared/configmap/ccp/configmapparserforccp.go

@@ -3,15 +3,32 @@ package ccpconfigmapsettings
 import (
 	"fmt"
 	"strings"
+	"os"
+	"time"
 
 	// "prometheus-collector/shared"
 	"github.com/prometheus-collector/shared"
 )
 
 func Configmapparserforccp() {
 	fmt.Printf("in configmapparserforccp")
+	fmt.Printf("waiting for 30 secs...")
+    time.Sleep(30 * time.Second) //needed to save a restart at times when config watcher sidecar starts up later than us and hence config map wasn't yet projected into emptydir volume yet during pod startups.
+
 	configVersionPath := "/etc/config/settings/config-version"
 	configSchemaPath := "/etc/config/settings/schema-version"
+
+	entries, er := os.ReadDir("/etc/config/settings")
+    if er != nil {
+        fmt.Println("error listing /etc/config/settings", er)
+    }
+
+    for _, e := range entries {
+            fmt.Println(e.Name())
+    }
+
+	fmt.Println("done listing /etc/config/settings")
+
 	// Set agent config schema version
 	if shared.ExistsAndNotEmpty(configSchemaPath) {
 		configVersion, err := shared.ReadAndTrim(configVersionPath)
@@ -25,7 +42,10 @@ func Configmapparserforccp() {
 			configVersion = configVersion[:10]
 		}
 		// Set the environment variable
+		fmt.Println("Configmapparserforccp setting env var AZMON_AGENT_CFG_FILE_VERSION:", configVersion)
 		shared.SetEnvAndSourceBashrcOrPowershell("AZMON_AGENT_CFG_FILE_VERSION", configVersion, true)
+	} else {
+		fmt.Println("Configmapparserforccp fileversion file doesn't exist. or configmap doesn't exist:", configVersionPath)
 	}
 
 	// Set agent config file version
@@ -41,7 +61,10 @@ func Configmapparserforccp() {
 			configSchemaVersion = configSchemaVersion[:10]
 		}
 		// Set the environment variable
+		fmt.Println("Configmapparserforccp setting env var AZMON_AGENT_CFG_SCHEMA_VERSION:", configSchemaVersion)
 		shared.SetEnvAndSourceBashrcOrPowershell("AZMON_AGENT_CFG_SCHEMA_VERSION", configSchemaVersion, true)
+	} else {
+		fmt.Println("Configmapparserforccp schemaversion file doesn't exist. or configmap doesn't exist:", configSchemaPath)
 	}
 
 	// Parse the configmap to set the right environment variables for prometheus collector settings

otelcollector/shared/configmap/ccp/tomlparser-ccp-default-scrape-settings.go

@@ -111,6 +111,7 @@ func (fcw *FileConfigWriter) WriteDefaultScrapeSettingsToFile(filename string, c
 
 func (c *Configurator) ConfigureDefaultScrapeSettings() {
 	configSchemaVersion := os.Getenv("AZMON_AGENT_CFG_SCHEMA_VERSION")
+	fmt.Printf("ConfigureDefaultScrapeSettings getenv:configSchemaVersion:", configSchemaVersion)
 
 	fmt.Printf("Start prometheus-collector-settings Processing\n")
 

otelcollector/shared/file_utilities.go

@@ -40,12 +40,15 @@ func FmtVar(name, value string) {
 func ExistsAndNotEmpty(filename string) bool {
 	info, err := os.Stat(filename)
 	if os.IsNotExist(err) {
+		fmt.Println("ExistsAndNotEmpty: file:", filename, "doesn't exist")
 		return false
 	}
 	if err != nil {
+		fmt.Println("ExistsAndNotEmpty: path:", filename, ":error:", err)
 		return false
 	}
 	if info.Size() == 0 {
+		fmt.Println("ExistsAndNotEmpty: file size is 0 for:", filename)
 		return false
 	}
 	return true
@@ -137,24 +140,25 @@ func SetEnvVarsFromFile(filename string) error {
 	return nil
 }
 
-func Inotify(outputFile string, location1 string, location2 string) error {
+func Inotify(outputFile string, location string) error {
 	// Start inotify to watch for changes
 	fmt.Println("Starting inotify for watching config map update")
 
 	_, err := os.Create(outputFile)
 	if err != nil {
 		log.Fatalf("Error creating output file: %v\n", err)
+		fmt.Println("Error creating inotify output file:", err)
 	}
 
 	// Define the command to start inotify
 	inotifyCommand := exec.Command(
 		"inotifywait",
-		location1,
-		location2,
+		location,
 		"--daemon",
 		"--recursive",
 		"--outfile", outputFile,
-		"--event", "create,delete",
+		"--event", "create",
+		"--event", "delete",
 		"--format", "%e : %T",
 		"--timefmt", "+%s",
 	)
@@ -163,6 +167,41 @@ func Inotify(outputFile string, location1 string, location2 string) error {
 	err = inotifyCommand.Start()
 	if err != nil {
 		log.Fatalf("Error starting inotify process: %v\n", err)
+		fmt.Println("Error starting inotify process:", err)
+	}
+
+	return nil
+}
+
+func InotifyCCP(outputFile string, location string) error {
+	// Start inotify to watch for changes
+	fmt.Println("Starting inotify for watching config map update for ccp")
+
+	_, err := os.Create(outputFile)
+	if err != nil {
+		log.Fatalf("Error creating output file: %v\n", err)
+		fmt.Println("Error creating inotify output file:", err)
+	}
+
+	// Define the command to start inotify
+	inotifyCommand := exec.Command(
+		"inotifywait",
+		location,
+		"--daemon",
+		"--recursive",
+		"--outfile", outputFile,
+		"--event", "create",
+		"--event", "delete",
+		"--event", "modify",
+		"--format", "%e : %T",
+		"--timefmt", "+%s",
+	)
+
+	// Start the inotify process
+	err = inotifyCommand.Start()
+	if err != nil {
+		log.Fatalf("Error starting inotify process: %v\n", err)
+		fmt.Println("Error starting inotify process:", err)
 	}
 
 	return nil

otelcollector/shared/process_utilities_linux.go

@@ -50,6 +50,7 @@ func SetEnvAndSourceBashrcOrPowershell(key, value string, echo bool) error {
 	// Set the environment variable
 	err := os.Setenv(key, value)
 	if err != nil {
+		fmt.Println("error in SetEnvAndSourceBashrcOrPowershell when setting key:", key, ":value:" , value, ":error:", err)
 		return fmt.Errorf("failed to set environment variable: %v", err)
 	}