PR feedback

Azure · Dec 4, 2024 · 6223611 · 6223611
1 parent 6bf6e00
commit 6223611
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/otelcollector/configuration-reader-builder/main.go b/otelcollector/configuration-reader-builder/main.go
@@ -257,7 +257,6 @@ func main() {
 		"--outfile", "/opt/inotifyoutput.txt",
 		"--event", "create",
 		"--event", "delete",
-		"--event", "modify",
 		"--format", "%e : %T",
 		"--timefmt", "+%s",
 	)

diff --git a/otelcollector/main/main.go b/otelcollector/main/main.go
@@ -33,15 +33,22 @@ func main() {
 
 	if osType == "linux" {
 		outputFile := "/opt/inotifyoutput.txt" 
-		if err := shared.Inotify(outputFile, "/etc/config/settings"); err != nil {
-			log.Fatal(err)
-		}
+
+		if ccpMetricsEnabled != "true" { //data-plane
+
+			if err := shared.Inotify(outputFile, "/etc/config/settings"); err != nil {
+				log.Fatal(err)
+			}
 
-		if ccpMetricsEnabled != "true" {
 			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")
 		shared.StartCommand("powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "C:\\opt\\scripts\\filesystemwatcher.ps1")

diff --git a/otelcollector/shared/file_utilities.go b/otelcollector/shared/file_utilities.go
@@ -150,6 +150,39 @@ func Inotify(outputFile string, location string) error {
 		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",
+		"--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
+}
+
+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",