Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.8.12 #4823

Merged
merged 3 commits into from
Aug 14, 2024
Merged

v1.8.12 #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
854dfd5
Polish unified slack ui (#4819)
brojd Aug 14, 2024
f5c8719
Bump axios from 1.6.7 to 1.7.4 in /grafana-plugin (#4816)
dependabot[bot] Aug 14, 2024
29bd42c
Fix collecting metrics (#4822)
Ferril Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions engine/apps/metrics_exporter/metrics_collectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
2 changes: 1 addition & 1 deletion grafana-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions grafana-plugin/src/assets/style/utils.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
margin-right: 4px;
}

.u-margin-left-xs {
margin-left: 4px;
}

.u-margin-bottom-none {
margin-bottom: 0;
}
Expand All @@ -44,6 +48,10 @@
margin-bottom: 12px;
}

.u-margin-bottom-xxs {
margin-bottom: 2px;
}

.u-margin-top-xs {
margin-top: 4px;
}
Expand Down
2 changes: 2 additions & 0 deletions grafana-plugin/src/components/WithConfirm/WithConfirm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
children,
disabled,
skip = false,
modalClass,
}) => {
const [showConfirmation, setShowConfirmation] = useState<boolean>(false);

Expand Down Expand Up @@ -57,6 +58,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
onDismiss={() => {
setShowConfirmation(false);
}}
modalClass={modalClass}
/>
)}
{React.cloneElement(children, {
Expand Down
17 changes: 12 additions & 5 deletions grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

.slack-infoblock {
text-align: center;
width: 725px;
width: 100%;
}

.external-link-style {
Expand All @@ -33,10 +33,9 @@
.infoblock-text {
margin-left: 48px;
margin-right: 48px;
margin-top: 24px;
}

.infoblock-icon {
.marginTop {
margin-top: 24px;
}

Expand All @@ -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;
}
Loading
Loading