feat/impl_installable_crd_prometheus #170

wjro · 2025-10-16T18:09:58Z

wjro commented

2025-10-16 18:09:58 +00:00

feat: implementation of Installable for CRDPrometheusIntroduction of Grafana trait and its impl for k8sanywhere
allows for CRDPrometheus to be installed via AlertingInterpret which standardizes the installation of alert receivers, alerting rules, and alert senders

feat: implementation of Installable for CRDPrometheusIntroduction of Grafana trait and its impl for k8sanywhere allows for CRDPrometheus to be installed via AlertingInterpret which standardizes the installation of alert receivers, alerting rules, and alert senders

wjro added 7 commits 2025-10-16 18:09:59 +00:00

feat:added k8s flavour to k8s_aywhere topology to be able to get the type of cluster

Run Check Script / check (pull_request) Successful in 33s

Details

f073b7e5fb

wip: moving the install steps for grafana and prometheus into the trait installable<T> 58b6268989

refactor(prometheus): modified crd prometheus to impl the installable trait 1f3796f503

wip: fixing grafana datasource for openshift which requires creating a token, sa, secret and inserting them into the grafanadatasource 85bec66e58

wip: connected the thanos-datasource to grafana, need to complete connecting the openshift-userworkload-monitoring as well 06a0c44c3c

wip: fixed token expiration and configured grafana dashboard 7dff70edcf

feat: implementation of Installable for CRDPrometheusIntroduction of Grafana trait and its impl for k8sanywhereallows for CRDPrometheus to be installed via AlertingInterpret which standardizes the installation of alert receivers, alerting rules, and alert senders fc384599a1

wjro added 1 commit 2025-10-16 18:17:44 +00:00

Merge remote-tracking branch 'origin/master' into feat/impl_installable_crd_prometheus

Run Check Script / check (pull_request) Has been cancelled

Details

c0d54a4466

letian reviewed 2025-10-20 18:16:11 +00:00

harmony/src/domain/topology/k8s.rs

						
				@ -59,6 +60,22 @@ impl K8sClient {

				        })

				    }

				    pub async fn service_account_api(&self, namespace: &str) -> Api<ServiceAccount> {

letian commented

2025-10-20 18:16:11 +00:00

This function doesn't seem to be used

letian reviewed 2025-10-20 18:18:09 +00:00

harmony/src/domain/topology/k8s_anywhere.rs

						
				@ -149,0 +308,4 @@

				        sender: &RHOBObservability,

				        inventory: &Inventory,

				    ) -> Result<PreparationOutcome, PreparationError> {

				        todo!()

letian commented

2025-10-20 18:18:09 +00:00

should it be implemented?

wjro commented

2025-10-20 19:16:54 +00:00

yes it should but this is out of scope for this pr, im only working on impl installable for alert sender CRDPrometheus

wjro marked this conversation as resolved

letian reviewed 2025-10-20 18:28:33 +00:00

harmony/src/domain/topology/k8s_anywhere.rs Outdated

						
				@ -197,3 +588,1 @@

				            receivers: receivers.unwrap_or_default(),

				            service_monitors: vec![],

				            prometheus_rules: vec![],

				        if let Some(sm) = service_monitors {

letian commented

2025-10-20 18:28:33 +00:00

Small detail, but we could also use service_monitors: service_monitors.unwrap_or_default() here:

            return K8sPrometheusCRDAlertingScore {
                sender,
                receivers: receivers.unwrap_or_default(),
                service_monitors: service_monitors.unwrap_or_default(),
                prometheus_rules: vec![],
            };

Small detail, but we could also use `service_monitors: service_monitors.unwrap_or_default()` here: ```rs return K8sPrometheusCRDAlertingScore { sender, receivers: receivers.unwrap_or_default(), service_monitors: service_monitors.unwrap_or_default(), prometheus_rules: vec![], }; ```

wjro marked this conversation as resolved

letian reviewed 2025-10-20 18:29:37 +00:00

harmony/src/domain/topology/k8s_anywhere.rs Outdated

						
				@ -468,0 +880,4 @@

				        if tenant.is_some() {

				            namespace_scope = true;

				        }

				        let _grafana_operator_score = grafana_helm_chart_score(namespace, namespace_scope)

letian commented

2025-10-20 18:29:37 +00:00

I don't think we should completely ignore the error here

wjro marked this conversation as resolved

letian reviewed 2025-10-20 18:35:25 +00:00

harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs

						
				@ -469,2 +470,2 @@

				        let mut json_data = BTreeMap::new();

				        json_data.insert("timeInterval".to_string(), "5s".to_string());

				        // let mut json_data = BTreeMap::new();

				        // json_data.insert("timeInterval".to_string(), "5s".to_string());