update script now calls api to fetch prom and puppetserver url

Author: basit9958

.gitignore

@@ -7,4 +7,7 @@ rpmbuild
 
 # Ignore the linuxaid tool binaries
 /linuxaid-cli
-/linuxaid-install
+/linuxaid-install
+
+# Claude Code
+/.claude

cmd/linuxaid-cli/run-openvox.go

@@ -62,12 +62,21 @@ func runOpenvoxAgent() error {
 func RunOpenvox() {
 	helper.LoadPuppetEnv()
 
-	allAPIReachable := checkconnectivity.CheckTCPConnection()
+	obmondoAPI := api.NewObmondoClient(api.GetObmondoURL(), false)
+
+	certname := helper.GetCertname()
+	prometheusHost, puppetServerHost := resolveCustomerURLs(obmondoAPI, certname)
+	slog.Info("resolved customer URLs",
+		slog.String("prometheus", prometheusHost),
+		slog.String("puppet_server", puppetServerHost))
+
+	allAPIReachable := checkconnectivity.CheckTCPConnection(prometheusHost, puppetServerHost)
 	if !allAPIReachable {
-		slog.Error("unable to connect to obmondo api, aborting", slog.String("error", "api not accessible"))
+		slog.Error("unable to connect to required hosts, aborting",
+			slog.String("prometheus", prometheusHost),
+			slog.String("puppet_server", puppetServerHost))
 		return
 	}
-	obmondoAPI := api.NewObmondoClient(api.GetObmondoURL(), false)
 
 	// nolint:errcheck
 	obmondoAPI.ServerPing()

cmd/linuxaid-cli/system-update.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"log/slog"
+	"net/url"
 	"os"
 	"slices"
 	"strings"
@@ -45,7 +46,7 @@ var systemUpdateCmd = &cobra.Command{
 
 func cleanup(puppetService *puppet.Service) {
 	if err := puppetService.EnableAgent(); err != nil {
-		slog.Error("unable to remove agent disable file and enable puppet agent")
+		slog.Error("unable to remove agent disable file and enable puppet agent", slog.Any("error", err))
 	}
 
 	slog.Info("ending system-update")
@@ -64,7 +65,7 @@ func UpdateSystem(distribution string) error {
 	case "centos", "rhel":
 		return updateRedHat()
 	default:
-		slog.Error("unknown distribution")
+		slog.Error("unknown distribution", slog.String("distribution", distribution))
 		return nil
 	}
 }
@@ -90,7 +91,7 @@ func updateDebian() error {
 	exitStatus := pipe.ExitStatus()
 	if exitStatus != 0 {
 		slog.Error("exiting, apt update failed")
-		return fmt.Errorf(" apt-get update and upgrade failed: exit status %d", exitStatus)
+		return fmt.Errorf("apt-get update and upgrade failed: exit status %d", exitStatus)
 	}
 
 	pipe = script.Exec("apt-get autoremove -y")
@@ -237,6 +238,70 @@ func buildPostUpdateComment(exporter security.SecurityExporter) string {
 	}
 }
 
+const defaultPrometheusHost = "prometheus.obmondo.com"
+
+// extractHostname parses a URL and returns just the hostname.
+// Returns empty string if parsing fails.
+func extractHostname(rawURL string) string {
+	parsed, err := url.Parse(rawURL)
+	if err == nil && parsed.Hostname() != "" {
+		return parsed.Hostname()
+	}
+	return ""
+}
+
+// resolveCustomerURLs fetches customer settings and returns resolved prometheus
+// and puppet server hostnames. Falls back to defaults if customer has not
+// configured them or if the API call fails.
+func resolveCustomerURLs(obmondoAPI api.ObmondoClient, certname string) (prometheusHost, puppetServerHost string) {
+	defaultPuppetServer := constant.DefaultPuppetServerCustomerID + constant.DefaultPuppetServerDomainSuffix
+	prometheusHost = defaultPrometheusHost
+	puppetServerHost = defaultPuppetServer
+
+	customerID := helper.GetCustomerID(certname)
+	if customerID == "" {
+		slog.Warn("could not determine customer ID from certname, using defaults",
+			slog.String("certname", certname))
+		return
+	}
+
+	settings, err := obmondoAPI.GetCustomerSettings(customerID)
+	if err != nil {
+		slog.Warn("failed to fetch customer settings, using defaults", slog.Any("error", err))
+		return
+	}
+
+	if settings.LinuxAid == nil {
+		slog.Info("no linuxaid settings configured for customer, using defaults",
+			slog.String("customer_id", customerID))
+		return
+	}
+
+	if settings.LinuxAid.PrometheusURL != "" {
+		h := extractHostname(settings.LinuxAid.PrometheusURL)
+		if h == "" {
+			slog.Warn("could not extract hostname from prometheus_url, using default",
+				slog.String("prometheus_url", settings.LinuxAid.PrometheusURL))
+		}
+		if h != "" {
+			prometheusHost = h
+		}
+	}
+
+	if settings.LinuxAid.PuppetserverURL != "" {
+		h := extractHostname(settings.LinuxAid.PuppetserverURL)
+		if h == "" {
+			slog.Warn("could not extract hostname from puppetserver_url, using default",
+				slog.String("puppetserver_url", settings.LinuxAid.PuppetserverURL))
+		}
+		if h != "" {
+			puppetServerHost = h
+		}
+	}
+
+	return
+}
+
 // ------------------------------------------------
 // ------------------------------------------------
 
@@ -245,7 +310,7 @@ func SystemUpdate() {
 
 	envErr := os.Setenv("PATH", constant.PuppetPath)
 	if envErr != nil {
-		slog.Error("failed to set the PATH env, exiting")
+		slog.Error("failed to set the PATH env, exiting", slog.Any("error", envErr))
 		os.Exit(1)
 	}
 
@@ -263,7 +328,7 @@ func SystemUpdate() {
 	openvoxInitiallyEnabled := true
 	if _, err := os.Stat(agentDisabledFile); err == nil {
 		openvoxInitiallyEnabled = false
-		slog.Warn("openvox agent was disabled before system-update, will skip opnvox operations")
+		slog.Warn("openvox agent was disabled before system-update, will skip openvox operations")
 	}
 
 	obmondoAPIURL := api.GetObmondoURL()
@@ -293,6 +358,13 @@ func SystemUpdate() {
 		os.Exit(1)
 	}
 
+	certname := helper.GetCertname()
+	prometheusHost, puppetServer := resolveCustomerURLs(obmondoAPI, certname)
+	config.GetViperInstance().Set(constant.CobraFlagOpenvoxServer, puppetServer)
+	slog.Info("resolved customer URLs",
+		slog.String("prometheus", prometheusHost),
+		slog.String("puppet_server", puppetServer))
+
 	puppetService := puppet.NewService(obmondoAPI, webtee.NewWebtee(obmondoAPI))
 
 	if openvoxInitiallyEnabled && !config.ShouldSkipOpenvox() {

cmd/linuxaid-cli/system-update_test.go

@@ -1,12 +1,15 @@
 package main
 
 import (
+	"errors"
 	"path/filepath"
 	"testing"
 	"time"
 
+	"gitea.obmondo.com/EnableIT/linuxaid-cli/constant"
 	"gitea.obmondo.com/EnableIT/linuxaid-cli/helper"
 	"gitea.obmondo.com/EnableIT/linuxaid-cli/mock"
+	api "gitea.obmondo.com/EnableIT/linuxaid-cli/pkg/obmondo"
 )
 
 func TestGetCustomerID(t *testing.T) {
@@ -65,3 +68,151 @@ func TestGetInstalledKernel(t *testing.T) {
 }
 
 // Need tests for 204 and 208 and a failed scenario as well
+
+func TestExtractHostname(t *testing.T) {
+	tests := []struct {
+		name     string
+		rawURL   string
+		expected string
+	}{
+		{"https URL", "https://prom-test.obmondo.com", "prom-test.obmondo.com"},
+		{"https URL with port", "https://prom-test.obmondo.com:9090", "prom-test.obmondo.com"},
+		{"https URL with path", "https://prom-test.obmondo.com/api/v1", "prom-test.obmondo.com"},
+		{"http URL", "http://prometheus.local:9090", "prometheus.local"},
+		{"empty string", "", ""},
+		{"bare hostname (no scheme)", "prom-test.obmondo.com", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := extractHostname(tt.rawURL)
+			if got != tt.expected {
+				t.Errorf("extractHostname(%q) = %q, want %q", tt.rawURL, got, tt.expected)
+			}
+		})
+	}
+}
+
+// mockSettingsClient is a mock that returns configurable customer settings.
+type mockSettingsClient struct {
+	mock.MockObmondoClient
+	settings *api.CustomerSettings
+	err      error
+}
+
+func (m *mockSettingsClient) GetCustomerSettings(_ string) (*api.CustomerSettings, error) {
+	return m.settings, m.err
+}
+
+func TestResolveCustomerURLs(t *testing.T) {
+	defaultPuppetServer := constant.DefaultPuppetServerCustomerID + constant.DefaultPuppetServerDomainSuffix
+
+	t.Run("returns custom URLs when settings exist", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: &api.CustomerSettings{
+				CustomerID: "enableit",
+				LinuxAid: &api.LinuxAidSettings{
+					PrometheusURL:   "https://prom-test.obmondo.com",
+					PuppetserverURL: "https://enableit.puppet.obmondo.com",
+				},
+			},
+		}
+		t.Setenv("CERTNAME", "testserver.enableit")
+
+		promHost, puppetHost := resolveCustomerURLs(client, "testserver.enableit")
+		if promHost != "prom-test.obmondo.com" {
+			t.Errorf("prometheus host = %q, want %q", promHost, "prom-test.obmondo.com")
+		}
+		if puppetHost != "enableit.puppet.obmondo.com" {
+			t.Errorf("puppet server host = %q, want %q", puppetHost, "enableit.puppet.obmondo.com")
+		}
+	})
+
+	t.Run("returns defaults when linuxaid settings are nil", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: &api.CustomerSettings{
+				CustomerID: "enableit",
+				LinuxAid:   nil,
+			},
+		}
+		t.Setenv("CERTNAME", "testserver.enableit")
+
+		promHost, puppetHost := resolveCustomerURLs(client, "testserver.enableit")
+		if promHost != defaultPrometheusHost {
+			t.Errorf("prometheus host = %q, want default %q", promHost, defaultPrometheusHost)
+		}
+		if puppetHost != defaultPuppetServer {
+			t.Errorf("puppet server host = %q, want default %q", puppetHost, defaultPuppetServer)
+		}
+	})
+
+	t.Run("returns defaults when API call fails", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: nil,
+			err:      errors.New("connection refused"),
+		}
+		t.Setenv("CERTNAME", "testserver.enableit")
+
+		promHost, puppetHost := resolveCustomerURLs(client, "testserver.enableit")
+		if promHost != defaultPrometheusHost {
+			t.Errorf("prometheus host = %q, want default %q", promHost, defaultPrometheusHost)
+		}
+		if puppetHost != defaultPuppetServer {
+			t.Errorf("puppet server host = %q, want default %q", puppetHost, defaultPuppetServer)
+		}
+	})
+
+	t.Run("returns defaults when certname has no customer ID", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: &api.CustomerSettings{},
+		}
+
+		promHost, puppetHost := resolveCustomerURLs(client, "")
+		if promHost != defaultPrometheusHost {
+			t.Errorf("prometheus host = %q, want default %q", promHost, defaultPrometheusHost)
+		}
+		if puppetHost != defaultPuppetServer {
+			t.Errorf("puppet server host = %q, want default %q", puppetHost, defaultPuppetServer)
+		}
+	})
+
+	t.Run("uses default for prometheus when only puppetserver is set", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: &api.CustomerSettings{
+				CustomerID: "enableit",
+				LinuxAid: &api.LinuxAidSettings{
+					PuppetserverURL: "https://custom.puppet.server.com",
+				},
+			},
+		}
+		t.Setenv("CERTNAME", "testserver.enableit")
+
+		promHost, puppetHost := resolveCustomerURLs(client, "testserver.enableit")
+		if promHost != defaultPrometheusHost {
+			t.Errorf("prometheus host = %q, want default %q", promHost, defaultPrometheusHost)
+		}
+		if puppetHost != "custom.puppet.server.com" {
+			t.Errorf("puppet server host = %q, want %q", puppetHost, "custom.puppet.server.com")
+		}
+	})
+
+	t.Run("uses default for puppetserver when only prometheus is set", func(t *testing.T) {
+		client := &mockSettingsClient{
+			settings: &api.CustomerSettings{
+				CustomerID: "enableit",
+				LinuxAid: &api.LinuxAidSettings{
+					PrometheusURL: "https://custom-prom.example.com:9090",
+				},
+			},
+		}
+		t.Setenv("CERTNAME", "testserver.enableit")
+
+		promHost, puppetHost := resolveCustomerURLs(client, "testserver.enableit")
+		if promHost != "custom-prom.example.com" {
+			t.Errorf("prometheus host = %q, want %q", promHost, "custom-prom.example.com")
+		}
+		if puppetHost != defaultPuppetServer {
+			t.Errorf("puppet server host = %q, want default %q", puppetHost, defaultPuppetServer)
+		}
+	})
+}

mock/api.go

@@ -32,6 +32,10 @@ func (*MockObmondoClient) UpdatePuppetLastRunReport() error {
 	return nil
 }
 
+func (*MockObmondoClient) GetCustomerSettings(_ string) (*api.CustomerSettings, error) {
+	return &api.CustomerSettings{}, nil
+}
+
 func (*MockObmondoClient) FetchServiceWindowStatus() (*http.Response, error) {
 	data := map[string]interface{}{
 		"status":  http.StatusOK,