Skip to content

MGMT-19704: Separate pod for monitor #8492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maorfr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MGMT-19704: Separate pod for monitor #8492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22689de
MGMT-19704: Separate pod for monitor
jhernand Jul 28, 2025
1457324
implement ai suggestion
maorfr Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ var Options struct {

// SlowHostMonitorLogThreshold defines the duration after which hosts that take too long to process will be logged
SlowHostMonitorLogThreshold time.Duration `envconfig:"SLOW_HOST_MONITOR_LOG_THRESHOLD" default:"1s"`

StartMonitors bool `envconfig:"START_MONITORS" default:"true"`
}

func InitLogs(logLevel, logFormat string) *logrus.Logger {
Expand Down Expand Up @@ -581,15 +583,19 @@ func main() {
failOnError(cerr, "Failed to create kubernetes cluster config")
k8sClient = kubernetes.NewForConfigOrDie(cfg)

startupLeader = leader.NewElector(k8sClient, leader.Config{LeaseDuration: 5 * time.Second,
RetryInterval: 2 * time.Second, Namespace: Options.LeaderConfig.Namespace, RenewDeadline: 4 * time.Second},
"assisted-service-migration-helper",
log.WithField("pkg", "migrationLeader"))

lead = leader.NewElector(k8sClient, Options.LeaderConfig, "assisted-service-leader-election-helper",
log.WithField("pkg", "monitor-runner"))

failOnError(lead.StartLeaderElection(context.Background()), "Failed to start leader")
if Options.StartMonitors {
lead = leader.NewElector(k8sClient, Options.LeaderConfig, "assisted-service-leader-election-helper",
log.WithField("pkg", "monitor-runner"))
failOnError(lead.StartLeaderElection(context.Background()), "Failed to start leader")
startupLeader = &leader.DummyElector{}
} else {
lead = &leader.DummyElector{}
startupLeader = leader.NewElector(k8sClient, leader.Config{LeaseDuration: 5 * time.Second,
RetryInterval: 2 * time.Second, Namespace: Options.LeaderConfig.Namespace, RenewDeadline: 4 * time.Second},
"assisted-service-migration-helper",
log.WithField("pkg", "migrationLeader"))
failOnError(autoMigrationWithLeader(startupLeader, db, log), "Failed auto migration process")
}

ocpClient, err = k8sclient.NewK8SClient("", log)
failOnError(err, "Failed to create client for OCP")
Expand All @@ -604,12 +610,12 @@ func main() {
failOnError(err, "Failed to create client for OCP")
}

failOnError(autoMigrationWithLeader(startupLeader, db, log), "Failed auto migration process")

default:
log.Fatalf("not supported deploy target %s", Options.DeployTarget)
}

failOnError(autoMigrationWithLeader(startupLeader, db, log), "Failed auto migration process")

Options.UploaderConfig.AssistedServiceVersion = versions.GetRevision()
Options.UploaderConfig.Versions = Options.Versions
if Options.GeneratorConfig.InstallInvoker == "agent-installer" {
Expand All @@ -632,15 +638,21 @@ func main() {
clusterEventsUploader.Start()
defer clusterEventsUploader.Stop()

clusterStateMonitor := thread.New(
log.WithField("pkg", "cluster-monitor"), "Cluster State Monitor", Options.ClusterStateMonitorInterval, clusterApi.ClusterMonitoring)
clusterStateMonitor.Start()
defer clusterStateMonitor.Stop()
var backgroundThreads []*thread.Thread

hostStateMonitor := thread.New(
log.WithField("pkg", "host-monitor"), "Host State Monitor", Options.HostStateMonitorInterval, hostApi.HostMonitoring)
hostStateMonitor.Start()
defer hostStateMonitor.Stop()
if Options.StartMonitors {
clusterStateMonitor := thread.New(
log.WithField("pkg", "cluster-monitor"), "Cluster State Monitor", Options.ClusterStateMonitorInterval, clusterApi.ClusterMonitoring)
clusterStateMonitor.Start()
defer clusterStateMonitor.Stop()
backgroundThreads = append(backgroundThreads, clusterStateMonitor)

hostStateMonitor := thread.New(
log.WithField("pkg", "host-monitor"), "Host State Monitor", Options.HostStateMonitorInterval, hostApi.HostMonitoring)
hostStateMonitor.Start()
defer hostStateMonitor.Stop()
backgroundThreads = append(backgroundThreads, hostStateMonitor)
}

failOnError(
versions.AddReleaseImagesToDBIfNeeded(db, releaseImagesArray, startupLeader, log, Options.EnableKubeAPI, Options.ReleaseSourcesConfig.ReleaseSources),
Expand Down Expand Up @@ -776,7 +788,7 @@ func main() {

h = gziphandler.GzipHandler(h)
h = app.WithMetricsResponderMiddleware(h)
h = app.WithHealthMiddleware(h, []*thread.Thread{hostStateMonitor, clusterStateMonitor},
h = app.WithHealthMiddleware(h, backgroundThreads,
log.WithField("pkg", "healthcheck"), Options.LivenessValidationTimeout)
h = requestid.Middleware(h)
h = spec.WithSpecMiddleware(h)
Expand Down
18 changes: 18 additions & 0 deletions openshift/template-monitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@ objects:
selector:
matchLabels:
app: assisted-service
- apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
prometheus: app-sre
name: servicemonitor-assisted-monitors-${NAMESPACE}
spec:
endpoints:
- interval: 30s
path: /metrics
port: assisted-svc
scheme: http
namespaceSelector:
matchNames:
- ${NAMESPACE}
selector:
matchLabels:
app: assisted-monitor
- apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down
Loading