Merge pull request #4823 from grafana/dev

v1.8.12
grafana · Aug 14, 2024 · f579294 · f579294
2 parents a2da8a4 + 29bd42c
commit f579294
Show file tree

Hide file tree

Showing 7 changed files with 188 additions and 128 deletions.
diff --git a/engine/apps/metrics_exporter/metrics_collectors.py b/engine/apps/metrics_exporter/metrics_collectors.py
@@ -232,3 +232,6 @@ def recalculate_cache_for_missing_org_ids(self, org_ids: set[int], missing_org_i
                 recalculate_orgs.append({"organization_id": org_id, "force": force_task})
         if recalculate_orgs:
             start_calculate_and_cache_metrics.apply_async((recalculate_orgs,))
+
+
+application_metrics_registry.register(ApplicationMetricsCollector())
diff --git a/grafana-plugin/package.json b/grafana-plugin/package.json
@@ -145,7 +145,7 @@
     "@grafana/ui": "^11.1.3",
     "@lifeomic/attempt": "^3.0.3",
     "array-move": "^4.0.0",
-    "axios": "^1.6.7",
+    "axios": "^1.7.4",
     "change-case": "^4.1.1",
     "circular-dependency-plugin": "^5.2.2",
     "classnames": "^2.3.2",

diff --git a/grafana-plugin/src/assets/style/utils.css b/grafana-plugin/src/assets/style/utils.css
@@ -36,6 +36,10 @@
   margin-right: 4px;
 }
 
+.u-margin-left-xs {
+  margin-left: 4px;
+}
+
 .u-margin-bottom-none {
   margin-bottom: 0;
 }
@@ -44,6 +48,10 @@
   margin-bottom: 12px;
 }
 
+.u-margin-bottom-xxs {
+  margin-bottom: 2px;
+}
+
 .u-margin-top-xs {
   margin-top: 4px;
 }

diff --git a/grafana-plugin/src/components/WithConfirm/WithConfirm.tsx b/grafana-plugin/src/components/WithConfirm/WithConfirm.tsx
@@ -17,6 +17,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
   children,
   disabled,
   skip = false,
+  modalClass,
 }) => {
   const [showConfirmation, setShowConfirmation] = useState<boolean>(false);
 
@@ -57,6 +58,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
           onDismiss={() => {
             setShowConfirmation(false);
           }}
+          modalClass={modalClass}
         />
       )}
       {React.cloneElement(children, {

diff --git a/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.module.css b/grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.module.css
@@ -18,7 +18,7 @@
 
 .slack-infoblock {
   text-align: center;
-  width: 725px;
+  width: 100%;
 }
 
 .external-link-style {
@@ -33,10 +33,9 @@
 .infoblock-text {
   margin-left: 48px;
   margin-right: 48px;
-  margin-top: 24px;
 }
 
-.infoblock-icon {
+.marginTop {
   margin-top: 24px;
 }
 
@@ -47,10 +46,18 @@
   transform: translateY(-50%);
 }
 
-.upgradeSlackAlert svg {
-  display: none;
+.upgradeSlackAlertText {
+  margin-right: 110px;
+
+  a {
+    font-weight: 600;
+  }
 }
 
 .linkToIncidentWrapper {
   margin-top: 16px;
 }
+
+.confirmUninstallModal input {
+  min-width: 300px;
+}