IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: use mimir logo (#47063)

Browse Source
This commit is contained in:
Gilles De Mey
2022-03-30 17:57:18 +02:00
committed by GitHub
parent 572ca553b6
commit 18862a22a6
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/alerting/unified/RuleEditor.test.tsx
View File

@@ -83,8 +83,8 @@ const ui = {
addLabel: byRole('button', { name: /Add label/ }),
// alert type buttons
grafanaManagedAlert: byRole('button', { name: /Grafana managed/ }),
lotexAlert: byRole('button', { name: /Cortex or Loki alert/ }),
lotexRecordingRule: byRole('button', { name: /Cortex or Loki recording rule/ }),
lotexAlert: byRole('button', { name: /Mimir or Loki alert/ }),
lotexRecordingRule: byRole('button', { name: /Mimir or Loki recording rule/ }),
},
};
@@ -523,16 +523,15 @@ describe('RuleEditor', () => {
mocks.getAllDataSources.mockReturnValue(Object.values(dataSources));
mocks.searchFolders.mockResolvedValue([]);
// render rule editor, select cortex/loki managed alerts
// render rule editor, select mimir/loki managed alerts
await renderRuleEditor();
await waitFor(() => expect(mocks.searchFolders).toHaveBeenCalled());
// wait for ui theck each datasource if it supports rule editing
await waitFor(() => expect(mocks.api.fetchRulerRulesGroup).toHaveBeenCalledTimes(4));
await ui.inputs.name.find();
userEvent.click(await ui.buttons.lotexAlert.get());
// wait for ui theck each datasource if it supports rule editing
await waitFor(() => expect(mocks.api.fetchRulerRulesGroup).toHaveBeenCalledTimes(4));
// check that only rules sources that have ruler available are there
const dataSourceSelect = ui.inputs.dataSource.get();
userEvent.click(byRole('combobox').get(dataSourceSelect));

10
public/app/features/alerting/unified/components/rule-editor/rule-types/CortexOrLokiAlert.tsx → public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiAlert.tsx
View File

@@ -7,19 +7,19 @@ interface Props extends SharedProps {
onClick: (value: RuleFormType) => void;
}
const CortexFlavoredType: FC<Props> = ({ selected = false, disabled = false, onClick }) => {
const MimirFlavoredType: FC<Props> = ({ selected = false, disabled = false, onClick }) => {
return (
<DisabledTooltip visible={disabled}>
<RuleType
name="Cortex or Loki alert"
name="Mimir or Loki alert"
description={
<span>
Use a Cortex or Loki datasource.
Use a Mimir, Loki or Cortex datasource.
<br />
Expressions are not supported.
</span>
}
image="/public/img/alerting/cortex_logo.svg"
image="/public/img/alerting/mimir_logo.svg"
selected={selected}
disabled={disabled}
value={RuleFormType.cloudAlerting}
@@ -29,4 +29,4 @@ const CortexFlavoredType: FC<Props> = ({ selected = false, disabled = false, onC
);
};
export { CortexFlavoredType };
export { MimirFlavoredType };

4
public/app/features/alerting/unified/components/rule-editor/rule-types/CortexOrLokiRecordingRule.tsx → public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiRecordingRule.tsx
View File

@@ -7,7 +7,7 @@ const RecordingRuleType: FC<SharedProps> = ({ selected = false, disabled = false
return (
<DisabledTooltip visible={disabled}>
<RuleType
name="Cortex or Loki recording rule"
name="Mimir or Loki recording rule"
description={
<span>
Precompute expressions.
@@ -15,7 +15,7 @@ const RecordingRuleType: FC<SharedProps> = ({ selected = false, disabled = false
Should be combined with an alert rule.
</span>
}
image="/public/img/alerting/cortex_logo_recording.svg"
image="/public/img/alerting/mimir_logo_recording.svg"
selected={selected}
disabled={disabled}
value={RuleFormType.cloudRecording}

9
public/app/features/alerting/unified/components/rule-editor/rule-types/RuleTypePicker.tsx
View File

@@ -4,8 +4,8 @@ import React, { FC } from 'react';
import { useRulesSourcesWithRuler } from '../../../hooks/useRuleSourcesWithRuler';
import { RuleFormType } from '../../../types/rule-form';
import { GrafanaManagedRuleType } from './GrafanaManagedAlert';
import { CortexFlavoredType } from './CortexOrLokiAlert';
import { RecordingRuleType } from './CortexOrLokiRecordingRule';
import { MimirFlavoredType } from './MimirOrLokiAlert';
import { RecordingRuleType } from './MimirOrLokiRecordingRule';
import { css } from '@emotion/css';
import { GrafanaTheme2 } from '@grafana/data/src';
import { Stack } from '@grafana/experimental';
@@ -25,7 +25,7 @@ const RuleTypePicker: FC<RuleTypePickerProps> = ({ selected, onChange }) => {
<>
<Stack direction="row" gap={2}>
<GrafanaManagedRuleType selected={selected === RuleFormType.grafana} onClick={onChange} />
<CortexFlavoredType
<MimirFlavoredType
selected={selected === RuleFormType.cloudAlerting}
onClick={onChange}
disabled={!hasLotexDatasources}
@@ -37,7 +37,8 @@ const RuleTypePicker: FC<RuleTypePickerProps> = ({ selected, onChange }) => {
/>
</Stack>
<small className={styles.meta}>
Select &ldquo;Grafana managed&rdquo; unless you have a Cortex or Loki data source with the Ruler API enabled.
Select &ldquo;Grafana managed&rdquo; unless you have a Mimir, Loki or Cortex data source with the Ruler API
enabled.
</small>
</>
);

1
public/img/alerting/cortex_logo.svg
View File

@@ -1 +0,0 @@
<svg viewBox="-4.2 -3.7 439.14 439.14" xmlns="http://www.w3.org/2000/svg"><path d="m329.643 275.202a54.609 54.609 0 1 0 -54.608-54.61 54.672 54.672 0 0 0 54.608 54.61zm0-89.35a34.947 34.947 0 1 1 -34.947 34.948 34.947 34.947 0 0 1 34.947-34.948z" fill="none"/><path d="m417.343 216.014c0-111.3-90.55-201.85-201.85-201.85s-201.85 90.55-201.85 201.85 90.55 201.85 201.85 201.85 201.85-90.55 201.85-201.85zm-292.54 9.436h-18.2a35.326 35.326 0 1 1 .278-6.204h22.287v.592l.064-.025 22.046 55.117 24.993-57.842h29.413l26.339-65.423 23.712 67.75h13.11a60.813 60.813 0 0 1 27.464-49.658l-58.457-55.534a34.96 34.96 0 1 1 4.39-4.389l59.643 56.66a60.816 60.816 0 1 1 -1.999 107.117l-58.118 58.118-4.386-4.386 57.134-57.135a60.828 60.828 0 0 1 -25.476-44.59h-17.707l-19.716-56.331-21.743 54.005h-29.525l-29.292 67.79zm54.916 128.737a34.947 34.947 0 1 1 34.947 34.947 34.947 34.947 0 0 1 -34.947-34.947z" fill="none"/><g fill="#3b697e"><path d="m426.65 216.014c0-116.432-94.725-211.156-211.157-211.156s-211.155 94.724-211.155 211.156 94.722 211.156 211.155 211.156 211.157-94.724 211.157-211.156zm-413.006 0c0-111.3 90.55-201.85 201.85-201.85s201.849 90.55 201.849 201.85-90.55 201.85-201.85 201.85-201.85-90.55-201.85-201.85z"/><circle cx="329.643" cy="220.8" r="34.947"/><circle cx="214.666" cy="354.187" r="34.947"/><path d="m209.874 223.292 21.743-54.005 19.716 56.331h17.707a60.828 60.828 0 0 0 25.476 44.59l-57.134 57.135 4.386 4.386 58.118-58.118a60.81 60.81 0 1 0 1.999-107.116l-59.643-56.66a34.954 34.954 0 1 0 -4.39 4.388l58.457 55.534a60.813 60.813 0 0 0 -27.463 49.657h-13.111l-23.712-67.749-26.339 65.423h-29.413l-24.993 57.841-22.046-55.117-.064.026v-.592h-22.287a34.958 34.958 0 1 0 -.278 6.204h18.2l26.254 65.632 29.292-67.79zm119.769-57.307a54.609 54.609 0 1 1 -54.608 54.608 54.67 54.67 0 0 1 54.608-54.608z"/></g></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

1
public/img/alerting/cortex_logo_recording.svg
View File

@@ -1 +0,0 @@
<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg"><path d="m333.843 278.902h.001c29.958 0 54.609-24.651 54.609-54.609s-24.651-54.609-54.609-54.609c-29.957 0-54.608 24.651-54.609 54.608.034 29.945 24.663 54.575 54.608 54.61zm0-89.35c19.171 0 34.947 15.776 34.947 34.947s-15.776 34.947-34.947 34.947-34.946-15.775-34.947-34.946v-.001c0-19.171 15.776-34.947 34.947-34.947z" fill="none"/><path d="m421.543 219.714c0-111.3-90.55-201.85-201.85-201.85s-201.85 90.55-201.85 201.85 90.55 201.85 201.85 201.85 201.85-90.55 201.85-201.85zm-292.54 9.436h-18.2c-2.333 17.465-17.395 30.649-35.015 30.649-19.379 0-35.326-15.947-35.326-35.326 0-19.38 15.947-35.326 35.326-35.326 18.804 0 34.48 15.013 35.293 33.799h22.287v.592l.064-.025 22.046 55.117 24.993-57.842h29.413l26.339-65.423 23.712 67.75h13.11c.397-20.053 10.689-38.663 27.464-49.658l-58.457-55.534c-6.288 5.257-14.229 8.14-22.425 8.14-19.179 0-34.96-15.782-34.96-34.96 0-19.179 15.781-34.96 34.96-34.96 19.178 0 34.96 15.781 34.96 34.96 0 8.199-2.884 16.142-8.145 22.431l59.643 56.66c8.597-4.416 18.124-6.72 27.789-6.72 33.363 0 60.816 27.453 60.816 60.816 0 33.362-27.453 60.816-60.816 60.816-10.433 0-20.692-2.685-29.788-7.795l-58.118 58.118-4.386-4.386 57.134-57.135c-14.649-10.368-23.983-26.705-25.476-44.59h-17.707l-19.716-56.331-21.743 54.005h-29.525l-29.292 67.79zm54.916 128.737c0-19.171 15.776-34.947 34.947-34.947s34.947 15.776 34.947 34.947-15.776 34.947-34.947 34.947-34.947-15.776-34.947-34.947z" fill="none"/><g fill="#3b697e"><path d="m430.85 219.714c0-116.432-94.725-211.156-211.157-211.156s-211.155 94.724-211.155 211.156 94.722 211.156 211.155 211.156 211.157-94.724 211.157-211.156zm-413.006 0c0-111.3 90.55-201.85 201.85-201.85s201.849 90.55 201.849 201.85-90.55 201.85-201.85 201.85-201.85-90.55-201.85-201.85h.001z" fill-rule="nonzero"/><circle cx="333.843" cy="224.5" r="34.947"/><circle cx="218.866" cy="357.887" r="34.947"/><path d="m214.074 226.992 21.743-54.005 19.716 56.331h17.707c1.493 17.885 10.827 34.222 25.476 44.59l-57.134 57.135 4.386 4.386 58.118-58.118c9.093 5.106 19.348 7.789 29.776 7.789 33.36 0 60.81-27.451 60.81-60.81s-27.45-60.81-60.81-60.81c-9.66 0-19.183 2.302-27.777 6.715l-59.643-56.66c5.261-6.288 8.146-14.231 8.146-22.43 0-19.175-15.779-34.954-34.954-34.954s-34.954 15.779-34.954 34.954 15.779 34.954 34.954 34.954c8.193 0 16.132-2.881 22.418-8.136l58.457 55.534c-16.774 10.995-27.066 29.605-27.463 49.657h-13.111l-23.712-67.749-26.339 65.423h-29.413l-24.993 57.841-22.046-55.117-.064.026v-.592h-22.287c-.821-18.577-16.328-33.415-34.924-33.415-19.177 0-34.958 15.781-34.958 34.958 0 19.178 15.781 34.958 34.958 34.958 17.425 0 32.323-13.028 34.646-30.297h18.2l26.254 65.632 29.292-67.79zm119.769-57.307h.001c29.958 0 54.609 24.651 54.609 54.609s-24.651 54.609-54.609 54.609-54.609-24.651-54.609-54.609v-.001c.034-29.944 24.664-54.574 54.608-54.608z" fill-rule="nonzero"/></g><path d="m337.399 336.8c0-17.198-13.961-31.16-31.159-31.16h-264.898c-17.198 0-31.161 13.962-31.161 31.16v62.32c0 17.198 13.963 31.16 31.161 31.16h264.898c17.198 0 31.159-13.962 31.159-31.16z"/><circle cx="84.842" cy="367.962" fill="#f00" r="36.225"/><path d="m142.162 395.885v-55.846h23.732c5.968 0 10.305.501 13.009 1.504 2.706 1.003 4.87 2.787 6.496 5.353 1.625 2.565 2.438 5.498 2.438 8.799 0 4.19-1.233 7.651-3.696 10.381s-6.145 4.45-11.047 5.161c2.438 1.423 4.451 2.984 6.038 4.686 1.587 1.701 3.727 4.724 6.418 9.066l6.82 10.896h-13.485l-8.153-12.153c-2.895-4.342-4.875-7.079-5.942-8.209s-2.197-1.904-3.39-2.323c-1.194-.42-3.086-.63-5.677-.63h-2.285v23.315zm11.276-32.229h8.342c5.41 0 8.788-.228 10.133-.685 1.346-.456 2.4-1.245 3.162-2.362.761-1.117 1.143-2.514 1.143-4.19 0-1.879-.502-3.397-1.505-4.552-1.004-1.156-2.419-1.886-4.248-2.19-.914-.127-3.657-.191-8.228-.191h-8.799z" fill="#fff" fill-rule="nonzero"/><path d="m198.465 395.885v-55.846h41.407v9.447h-30.132v12.38h28.037v9.41h-28.037v15.199h31.199v9.41z" fill="#fff" fill-rule="nonzero"/><path d="m286.233 375.351 10.933 3.467c-1.677 6.094-4.464 10.621-8.362 13.581-3.898 2.958-8.844 4.437-14.838 4.437-7.415 0-13.509-2.533-18.285-7.6-4.774-5.065-7.161-11.992-7.161-20.78 0-9.294 2.4-16.513 7.2-21.656s11.111-7.714 18.932-7.714c6.832 0 12.381 2.02 16.648 6.057 2.539 2.387 4.444 5.815 5.713 10.285l-11.16 2.667c-.662-2.895-2.039-5.181-4.134-6.857-2.096-1.676-4.641-2.514-7.637-2.514-4.14 0-7.5 1.486-10.077 4.457s-3.867 7.784-3.867 14.438c0 7.059 1.27 12.088 3.81 15.085s5.841 4.494 9.904 4.494c2.997 0 5.575-.952 7.734-2.857 2.158-1.904 3.707-4.901 4.647-8.99z" fill="#fff" fill-rule="nonzero"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

1
public/img/alerting/mimir_logo.svg Normal file
View File

@@ -0,0 +1 @@
<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
public/img/alerting/mimir_logo_recording.svg Normal file
View File

@@ -0,0 +1 @@
<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 440 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(0 413.9 -413.9 0 219.645 68.5)" gradientUnits="userSpaceOnUse" x1="0" x2="1" y1="0" y2="0"><stop offset="0" stop-color="#f2c144"/><stop offset=".24" stop-color="#f1a03b"/><stop offset=".57" stop-color="#f17a31"/><stop offset=".84" stop-color="#f0632a"/><stop offset="1" stop-color="#f05a28"/></linearGradient><path d="m54.404 375.588h63.152l44.246-84.969-30.624-58.779zm343.478-146.147-34.53 66.276 40.44 78.896 34.555-66.55zm-10.492-20.293-73.719-143.047-36.358 64.127 75.497 145.272zm-114.835 87.469 41.116 78.921h70.113l-76.222-146.271zm-151.844-84.969-34.381-66.326-43.895 84.42 33.729 65.275zm-88.543 38.186-31.375 61.952 34.53 62.703 30.6-59.204zm233.477-100.538-36.559 64.551 33.002 62.702 35.057-67.35zm-137.898-85.744-31.551 61.377 122.698 234.64 32.728-62.802-62-118.982z" fill="url(#a)" fill-rule="nonzero"/><path d="m383.609 330.855c0-17.198-13.961-31.16-31.159-31.16h-264.898c-17.198 0-31.161 13.962-31.161 31.16v62.32c0 17.198 13.963 31.16 31.161 31.16h264.898c17.198 0 31.159-13.962 31.159-31.16z"/><circle cx="131.052" cy="362.017" fill="#f00" r="36.225"/><g fill="#fff" fill-rule="nonzero"><path d="m188.372 389.94v-55.846h23.732c5.968 0 10.305.501 13.009 1.504 2.706 1.003 4.87 2.787 6.496 5.353 1.625 2.565 2.438 5.498 2.438 8.799 0 4.19-1.233 7.651-3.696 10.381s-6.145 4.45-11.047 5.161c2.438 1.423 4.451 2.984 6.038 4.686 1.587 1.701 3.727 4.724 6.418 9.066l6.82 10.896h-13.485l-8.153-12.153c-2.895-4.342-4.875-7.079-5.942-8.209s-2.197-1.904-3.39-2.323c-1.194-.42-3.086-.63-5.677-.63h-2.285v23.315zm11.276-32.229h8.342c5.41 0 8.788-.228 10.133-.685 1.346-.456 2.4-1.245 3.162-2.362.761-1.117 1.143-2.514 1.143-4.19 0-1.879-.502-3.397-1.505-4.552-1.004-1.156-2.419-1.886-4.248-2.19-.914-.127-3.657-.191-8.228-.191h-8.799z"/><path d="m244.675 389.94v-55.846h41.407v9.447h-30.132v12.38h28.037v9.41h-28.037v15.199h31.199v9.41z"/><path d="m332.443 369.406 10.933 3.467c-1.677 6.094-4.464 10.621-8.362 13.581-3.898 2.958-8.844 4.437-14.838 4.437-7.415 0-13.509-2.533-18.285-7.6-4.774-5.065-7.161-11.992-7.161-20.78 0-9.294 2.4-16.513 7.2-21.656s11.111-7.714 18.932-7.714c6.832 0 12.381 2.02 16.648 6.057 2.539 2.387 4.444 5.815 5.713 10.285l-11.16 2.667c-.662-2.895-2.039-5.181-4.134-6.857-2.096-1.676-4.641-2.514-7.637-2.514-4.14 0-7.5 1.486-10.077 4.457s-3.867 7.784-3.867 14.438c0 7.059 1.27 12.088 3.81 15.085s5.841 4.494 9.904 4.494c2.997 0 5.575-.952 7.734-2.857 2.158-1.904 3.707-4.901 4.647-8.99z"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB