NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 7 Actions Packages Projects Releases 1 Wiki Activity

Monitor an application within a tenant #86

Merged
letian merged 22 commits from feat/crd-alertmanager-configs into master 2025-08-04 21:42:05 +00:00
Conversation 0 Commits 22 Files Changed 43 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9403581be5 - Show all commits

8
harmony/src/domain/topology/k8s_anywhere.rs
View File

@ -271,11 +271,11 @@ impl K8sAnywhereTopology {
&self, &self,
sender: &CRDPrometheus, sender: &CRDPrometheus,
) -> Result<Outcome, InterpretError> { ) -> Result<Outcome, InterpretError> {
let output = Command::new("sh") let status = Command::new("sh")
.args(["-c", "kubectl get crd -A | grep -i prometheuses"]) .args(["-c", "kubectl get crd -A | grep -i prometheuses"])
.output() .status()
.map_err(|e| InterpretError::new(format!("could not connect to cluster: {}", e)))?; .map_err(|e| InterpretError::new(format!("could not connect to cluster: {}", e)))?;
if output.status.success() && output.stdout.is_empty() { if !status.success() {
if let Some(Some(k8s_state)) = self.k8s_state.get() { if let Some(Some(k8s_state)) = self.k8s_state.get() {
match k8s_state.source { match k8s_state.source {
K8sSource::LocalK3d => { K8sSource::LocalK3d => {
@ -300,7 +300,9 @@ impl K8sAnywhereTopology {
return Ok(Outcome::noop()); return Ok(Outcome::noop());
} }
} }
debug!("Prometheus operator is already present, skipping install"); debug!("Prometheus operator is already present, skipping install");
Ok(Outcome::success( Ok(Outcome::success(
"prometheus operator present in cluster".to_string(), "prometheus operator present in cluster".to_string(),
)) ))