Update mirroring.libsonnet

red-hat-storage · Dec 12, 2023 · 4e1b69d · 4e1b69d
1 parent 1e2ff02
commit 4e1b69d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/metrics/mixin/alerts/mirroring.libsonnet b/metrics/mixin/alerts/mirroring.libsonnet
@@ -18,11 +18,7 @@
               description: 'Mirror daemon is in unhealthy status for more than %s. Mirroring on this cluster is not working as expected.' % $._config.odfMirrorDaemonStatusAlertTime,
               storage_type: $._config.cephStorageType,
               severity_level: 'error',
-<<<<<<< HEAD
               runbook_url: 'https://github.com/openshift/runbooks/blob/master/alerts/openshift-container-storage-operator/OdfMirrorDaemonStatus.md',
-=======
-              runbook_url: 'https://github.com/openshift/runbooks/blob/master/alerts/openshift-container-storage-operator/OdfMirrorDaemonStatus.md'
->>>>>>> 04df2797 (add runbooks_url to alerts)
             },
           },
           {