From 8b44945410f25a568f38536aeb614295fc32492d Mon Sep 17 00:00:00 2001 From: Zain Siddiqui <64101827+John2020-cyber@users.noreply.github.com> Date: Mon, 15 Jan 2024 17:52:15 +0500 Subject: [PATCH 1/5] [WIP] Removes tenantId in Grafana config Removing TenantId from go and check --- pkg/monitors/grafana/grafana-monitor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 533fd9d1..23e650d5 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -103,7 +103,6 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito Target: monitor.URL, Job: monitor.Name, Frequency: service.frequency, - TenantId: tenantID, Timeout: 2000, Enabled: true, Probes: probeIDs, From 1e9e68e019c62d1b4c7b240fa5d00e856d266eef Mon Sep 17 00:00:00 2001 From: stakater-nordmart-bot Date: Mon, 15 Jan 2024 18:11:12 +0500 Subject: [PATCH 2/5] fix --- pkg/monitors/grafana/grafana-monitor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 23e650d5..373c8d51 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -92,7 +92,6 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito } checkId = idResult } - var tenantID int64 grafanaConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) if grafanaConfig != nil { tenantID = grafanaConfig.TenantId From 8d4bc6831c7f6a569f9d376acd3d2ea6da1d4039 Mon Sep 17 00:00:00 2001 From: stakater-nordmart-bot Date: Mon, 15 Jan 2024 18:13:54 +0500 Subject: [PATCH 3/5] Update --- pkg/monitors/grafana/grafana-monitor.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 373c8d51..b8d51ef5 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -93,9 +93,6 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito checkId = idResult } grafanaConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) - if grafanaConfig != nil { - tenantID = grafanaConfig.TenantId - } // Creating a new Check object return &synthetic_monitoring.Check{ Id: checkId, From 714fe917531f618f8ce1fbc4e94b49f7ea0e944d Mon Sep 17 00:00:00 2001 From: stakater-nordmart-bot Date: Mon, 15 Jan 2024 18:16:27 +0500 Subject: [PATCH 4/5] update --- pkg/monitors/grafana/grafana-monitor.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index b8d51ef5..c0ea424c 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -45,11 +45,6 @@ func (service *GrafanaMonitorService) Setup(provider config.Provider) { service.smClient = client service.tenant = tenant //CHECK if freq is set - if provider.GrafanaConfig.Frequency > 0 { - service.frequency = provider.GrafanaConfig.Frequency - } else { - service.frequency = FrequencyDefaultValue - } } func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { @@ -65,9 +60,6 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { Name: check.Job, URL: check.Target, ID: fmt.Sprintf("%v", check.Id), - Config: &endpointmonitorv1alpha1.GrafanaConfig{ - TenantId: check.TenantId, - }, }) } return monitors @@ -92,7 +84,6 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito } checkId = idResult } - grafanaConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) // Creating a new Check object return &synthetic_monitoring.Check{ Id: checkId, From 34b547b3f3c5314dae2e777f97c18492b38b4c07 Mon Sep 17 00:00:00 2001 From: stakater-nordmart-bot Date: Mon, 15 Jan 2024 18:34:32 +0500 Subject: [PATCH 5/5] Revert --- pkg/monitors/grafana/grafana-monitor.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index c0ea424c..23e650d5 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -45,6 +45,11 @@ func (service *GrafanaMonitorService) Setup(provider config.Provider) { service.smClient = client service.tenant = tenant //CHECK if freq is set + if provider.GrafanaConfig.Frequency > 0 { + service.frequency = provider.GrafanaConfig.Frequency + } else { + service.frequency = FrequencyDefaultValue + } } func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { @@ -60,6 +65,9 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { Name: check.Job, URL: check.Target, ID: fmt.Sprintf("%v", check.Id), + Config: &endpointmonitorv1alpha1.GrafanaConfig{ + TenantId: check.TenantId, + }, }) } return monitors @@ -84,6 +92,11 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito } checkId = idResult } + var tenantID int64 + grafanaConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) + if grafanaConfig != nil { + tenantID = grafanaConfig.TenantId + } // Creating a new Check object return &synthetic_monitoring.Check{ Id: checkId,