diff --git a/packages/grafana-ui/src/components/Icon/cached.json b/packages/grafana-ui/src/components/Icon/cached.json index 4f62efd4552..781f0d9c845 100644 --- a/packages/grafana-ui/src/components/Icon/cached.json +++ b/packages/grafana-ui/src/components/Icon/cached.json @@ -60,6 +60,7 @@ "unicons/ellipsis-h", "unicons/envelope", "unicons/exchange-alt", + "unicons/exclamation-circle", "unicons/exclamation-triangle", "unicons/external-link-alt", "unicons/eye", diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts b/packages/grafana-ui/src/components/Icon/iconBundle.ts index 24682bce731..675871f8201 100644 --- a/packages/grafana-ui/src/components/Icon/iconBundle.ts +++ b/packages/grafana-ui/src/components/Icon/iconBundle.ts @@ -68,111 +68,112 @@ import u1057 from '../../../../../public/img/icons/unicons/ellipsis-v.svg'; import u1058 from '../../../../../public/img/icons/unicons/ellipsis-h.svg'; import u1059 from '../../../../../public/img/icons/unicons/envelope.svg'; import u1060 from '../../../../../public/img/icons/unicons/exchange-alt.svg'; -import u1061 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg'; -import u1062 from '../../../../../public/img/icons/unicons/external-link-alt.svg'; -import u1063 from '../../../../../public/img/icons/unicons/eye.svg'; -import u1064 from '../../../../../public/img/icons/unicons/eye-slash.svg'; -import u1065 from '../../../../../public/img/icons/unicons/file-alt.svg'; -import u1066 from '../../../../../public/img/icons/unicons/file-blank.svg'; -import u1067 from '../../../../../public/img/icons/unicons/filter.svg'; -import u1068 from '../../../../../public/img/icons/unicons/folder.svg'; -import u1069 from '../../../../../public/img/icons/unicons/folder-open.svg'; -import u1070 from '../../../../../public/img/icons/unicons/folder-plus.svg'; -import u1071 from '../../../../../public/img/icons/unicons/folder-upload.svg'; -import u1072 from '../../../../../public/img/icons/unicons/forward.svg'; -import u1073 from '../../../../../public/img/icons/unicons/graph-bar.svg'; -import u1074 from '../../../../../public/img/icons/unicons/history.svg'; -import u1075 from '../../../../../public/img/icons/unicons/home-alt.svg'; -import u1076 from '../../../../../public/img/icons/unicons/import.svg'; -import u1077 from '../../../../../public/img/icons/unicons/info.svg'; -import u1078 from '../../../../../public/img/icons/unicons/info-circle.svg'; -import u1079 from '../../../../../public/img/icons/unicons/k6.svg'; -import u1080 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg'; -import u1081 from '../../../../../public/img/icons/unicons/keyboard.svg'; -import u1082 from '../../../../../public/img/icons/unicons/link.svg'; -import u1083 from '../../../../../public/img/icons/unicons/list-ul.svg'; -import u1084 from '../../../../../public/img/icons/unicons/lock.svg'; -import u1085 from '../../../../../public/img/icons/unicons/minus.svg'; -import u1086 from '../../../../../public/img/icons/unicons/minus-circle.svg'; -import u1087 from '../../../../../public/img/icons/unicons/mobile-android.svg'; -import u1088 from '../../../../../public/img/icons/unicons/monitor.svg'; -import u1089 from '../../../../../public/img/icons/unicons/pause.svg'; -import u1090 from '../../../../../public/img/icons/unicons/pen.svg'; -import u1091 from '../../../../../public/img/icons/unicons/play.svg'; -import u1092 from '../../../../../public/img/icons/unicons/plug.svg'; -import u1093 from '../../../../../public/img/icons/unicons/plus.svg'; -import u1094 from '../../../../../public/img/icons/unicons/plus-circle.svg'; -import u1095 from '../../../../../public/img/icons/unicons/power.svg'; -import u1096 from '../../../../../public/img/icons/unicons/presentation-play.svg'; -import u1097 from '../../../../../public/img/icons/unicons/process.svg'; -import u1098 from '../../../../../public/img/icons/unicons/question-circle.svg'; -import u1099 from '../../../../../public/img/icons/unicons/repeat.svg'; -import u1100 from '../../../../../public/img/icons/unicons/rocket.svg'; -import u1101 from '../../../../../public/img/icons/unicons/rss.svg'; -import u1102 from '../../../../../public/img/icons/unicons/save.svg'; -import u1103 from '../../../../../public/img/icons/unicons/search.svg'; -import u1104 from '../../../../../public/img/icons/unicons/search-minus.svg'; -import u1105 from '../../../../../public/img/icons/unicons/search-plus.svg'; -import u1106 from '../../../../../public/img/icons/unicons/share-alt.svg'; -import u1107 from '../../../../../public/img/icons/unicons/shield.svg'; -import u1108 from '../../../../../public/img/icons/unicons/signal.svg'; -import u1109 from '../../../../../public/img/icons/unicons/signin.svg'; -import u1110 from '../../../../../public/img/icons/unicons/signout.svg'; -import u1111 from '../../../../../public/img/icons/unicons/sitemap.svg'; -import u1112 from '../../../../../public/img/icons/unicons/slack.svg'; -import u1113 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg'; -import u1114 from '../../../../../public/img/icons/unicons/sort-amount-down.svg'; -import u1115 from '../../../../../public/img/icons/unicons/sort-amount-up.svg'; -import u1116 from '../../../../../public/img/icons/unicons/square-shape.svg'; -import u1117 from '../../../../../public/img/icons/unicons/star.svg'; -import u1118 from '../../../../../public/img/icons/unicons/step-backward.svg'; -import u1119 from '../../../../../public/img/icons/unicons/sync.svg'; -import u1120 from '../../../../../public/img/icons/unicons/table.svg'; -import u1121 from '../../../../../public/img/icons/unicons/tag-alt.svg'; -import u1122 from '../../../../../public/img/icons/unicons/times.svg'; -import u1123 from '../../../../../public/img/icons/unicons/trash-alt.svg'; -import u1124 from '../../../../../public/img/icons/unicons/unlock.svg'; -import u1125 from '../../../../../public/img/icons/unicons/upload.svg'; -import u1126 from '../../../../../public/img/icons/unicons/user.svg'; -import u1127 from '../../../../../public/img/icons/unicons/users-alt.svg'; -import u1128 from '../../../../../public/img/icons/unicons/wrap-text.svg'; -import u1129 from '../../../../../public/img/icons/unicons/cloud-upload.svg'; -import u1130 from '../../../../../public/img/icons/unicons/credit-card.svg'; -import u1131 from '../../../../../public/img/icons/unicons/file-copy-alt.svg'; -import u1132 from '../../../../../public/img/icons/unicons/fire.svg'; -import u1133 from '../../../../../public/img/icons/unicons/hourglass.svg'; -import u1134 from '../../../../../public/img/icons/unicons/layer-group.svg'; -import u1135 from '../../../../../public/img/icons/unicons/layers-alt.svg'; -import u1136 from '../../../../../public/img/icons/unicons/line-alt.svg'; -import u1137 from '../../../../../public/img/icons/unicons/list-ui-alt.svg'; -import u1138 from '../../../../../public/img/icons/unicons/message.svg'; -import u1139 from '../../../../../public/img/icons/unicons/palette.svg'; -import u1140 from '../../../../../public/img/icons/unicons/percentage.svg'; -import u1141 from '../../../../../public/img/icons/unicons/shield-exclamation.svg'; -import u1142 from '../../../../../public/img/icons/unicons/plus-square.svg'; -import u1143 from '../../../../../public/img/icons/unicons/x.svg'; -import u1144 from '../../../../../public/img/icons/unicons/capture.svg'; -import u1145 from '../../../../../public/img/icons/custom/gf-grid.svg'; -import u1146 from '../../../../../public/img/icons/custom/gf-landscape.svg'; -import u1147 from '../../../../../public/img/icons/custom/gf-layout-simple.svg'; -import u1148 from '../../../../../public/img/icons/custom/gf-portrait.svg'; -import u1149 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg'; -import u1150 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg'; -import u1151 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg'; -import u1152 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg'; -import u1153 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg'; -import u1154 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg'; -import u1155 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg'; -import u1156 from '../../../../../public/img/icons/custom/gf-logs.svg'; -import u1157 from '../../../../../public/img/icons/custom/gf-movepane-left.svg'; -import u1158 from '../../../../../public/img/icons/custom/gf-movepane-right.svg'; -import u1159 from '../../../../../public/img/icons/mono/favorite.svg'; -import u1160 from '../../../../../public/img/icons/mono/grafana.svg'; -import u1161 from '../../../../../public/img/icons/mono/heart.svg'; -import u1162 from '../../../../../public/img/icons/mono/heart-break.svg'; -import u1163 from '../../../../../public/img/icons/mono/panel-add.svg'; -import u1164 from '../../../../../public/img/icons/mono/library-panel.svg'; -import u1165 from '../../../../../public/img/icons/unicons/record-audio.svg'; +import u1061 from '../../../../../public/img/icons/unicons/exclamation-circle.svg'; +import u1062 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg'; +import u1063 from '../../../../../public/img/icons/unicons/external-link-alt.svg'; +import u1064 from '../../../../../public/img/icons/unicons/eye.svg'; +import u1065 from '../../../../../public/img/icons/unicons/eye-slash.svg'; +import u1066 from '../../../../../public/img/icons/unicons/file-alt.svg'; +import u1067 from '../../../../../public/img/icons/unicons/file-blank.svg'; +import u1068 from '../../../../../public/img/icons/unicons/filter.svg'; +import u1069 from '../../../../../public/img/icons/unicons/folder.svg'; +import u1070 from '../../../../../public/img/icons/unicons/folder-open.svg'; +import u1071 from '../../../../../public/img/icons/unicons/folder-plus.svg'; +import u1072 from '../../../../../public/img/icons/unicons/folder-upload.svg'; +import u1073 from '../../../../../public/img/icons/unicons/forward.svg'; +import u1074 from '../../../../../public/img/icons/unicons/graph-bar.svg'; +import u1075 from '../../../../../public/img/icons/unicons/history.svg'; +import u1076 from '../../../../../public/img/icons/unicons/home-alt.svg'; +import u1077 from '../../../../../public/img/icons/unicons/import.svg'; +import u1078 from '../../../../../public/img/icons/unicons/info.svg'; +import u1079 from '../../../../../public/img/icons/unicons/info-circle.svg'; +import u1080 from '../../../../../public/img/icons/unicons/k6.svg'; +import u1081 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg'; +import u1082 from '../../../../../public/img/icons/unicons/keyboard.svg'; +import u1083 from '../../../../../public/img/icons/unicons/link.svg'; +import u1084 from '../../../../../public/img/icons/unicons/list-ul.svg'; +import u1085 from '../../../../../public/img/icons/unicons/lock.svg'; +import u1086 from '../../../../../public/img/icons/unicons/minus.svg'; +import u1087 from '../../../../../public/img/icons/unicons/minus-circle.svg'; +import u1088 from '../../../../../public/img/icons/unicons/mobile-android.svg'; +import u1089 from '../../../../../public/img/icons/unicons/monitor.svg'; +import u1090 from '../../../../../public/img/icons/unicons/pause.svg'; +import u1091 from '../../../../../public/img/icons/unicons/pen.svg'; +import u1092 from '../../../../../public/img/icons/unicons/play.svg'; +import u1093 from '../../../../../public/img/icons/unicons/plug.svg'; +import u1094 from '../../../../../public/img/icons/unicons/plus.svg'; +import u1095 from '../../../../../public/img/icons/unicons/plus-circle.svg'; +import u1096 from '../../../../../public/img/icons/unicons/power.svg'; +import u1097 from '../../../../../public/img/icons/unicons/presentation-play.svg'; +import u1098 from '../../../../../public/img/icons/unicons/process.svg'; +import u1099 from '../../../../../public/img/icons/unicons/question-circle.svg'; +import u1100 from '../../../../../public/img/icons/unicons/repeat.svg'; +import u1101 from '../../../../../public/img/icons/unicons/rocket.svg'; +import u1102 from '../../../../../public/img/icons/unicons/rss.svg'; +import u1103 from '../../../../../public/img/icons/unicons/save.svg'; +import u1104 from '../../../../../public/img/icons/unicons/search.svg'; +import u1105 from '../../../../../public/img/icons/unicons/search-minus.svg'; +import u1106 from '../../../../../public/img/icons/unicons/search-plus.svg'; +import u1107 from '../../../../../public/img/icons/unicons/share-alt.svg'; +import u1108 from '../../../../../public/img/icons/unicons/shield.svg'; +import u1109 from '../../../../../public/img/icons/unicons/signal.svg'; +import u1110 from '../../../../../public/img/icons/unicons/signin.svg'; +import u1111 from '../../../../../public/img/icons/unicons/signout.svg'; +import u1112 from '../../../../../public/img/icons/unicons/sitemap.svg'; +import u1113 from '../../../../../public/img/icons/unicons/slack.svg'; +import u1114 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg'; +import u1115 from '../../../../../public/img/icons/unicons/sort-amount-down.svg'; +import u1116 from '../../../../../public/img/icons/unicons/sort-amount-up.svg'; +import u1117 from '../../../../../public/img/icons/unicons/square-shape.svg'; +import u1118 from '../../../../../public/img/icons/unicons/star.svg'; +import u1119 from '../../../../../public/img/icons/unicons/step-backward.svg'; +import u1120 from '../../../../../public/img/icons/unicons/sync.svg'; +import u1121 from '../../../../../public/img/icons/unicons/table.svg'; +import u1122 from '../../../../../public/img/icons/unicons/tag-alt.svg'; +import u1123 from '../../../../../public/img/icons/unicons/times.svg'; +import u1124 from '../../../../../public/img/icons/unicons/trash-alt.svg'; +import u1125 from '../../../../../public/img/icons/unicons/unlock.svg'; +import u1126 from '../../../../../public/img/icons/unicons/upload.svg'; +import u1127 from '../../../../../public/img/icons/unicons/user.svg'; +import u1128 from '../../../../../public/img/icons/unicons/users-alt.svg'; +import u1129 from '../../../../../public/img/icons/unicons/wrap-text.svg'; +import u1130 from '../../../../../public/img/icons/unicons/cloud-upload.svg'; +import u1131 from '../../../../../public/img/icons/unicons/credit-card.svg'; +import u1132 from '../../../../../public/img/icons/unicons/file-copy-alt.svg'; +import u1133 from '../../../../../public/img/icons/unicons/fire.svg'; +import u1134 from '../../../../../public/img/icons/unicons/hourglass.svg'; +import u1135 from '../../../../../public/img/icons/unicons/layer-group.svg'; +import u1136 from '../../../../../public/img/icons/unicons/layers-alt.svg'; +import u1137 from '../../../../../public/img/icons/unicons/line-alt.svg'; +import u1138 from '../../../../../public/img/icons/unicons/list-ui-alt.svg'; +import u1139 from '../../../../../public/img/icons/unicons/message.svg'; +import u1140 from '../../../../../public/img/icons/unicons/palette.svg'; +import u1141 from '../../../../../public/img/icons/unicons/percentage.svg'; +import u1142 from '../../../../../public/img/icons/unicons/shield-exclamation.svg'; +import u1143 from '../../../../../public/img/icons/unicons/plus-square.svg'; +import u1144 from '../../../../../public/img/icons/unicons/x.svg'; +import u1145 from '../../../../../public/img/icons/unicons/capture.svg'; +import u1146 from '../../../../../public/img/icons/custom/gf-grid.svg'; +import u1147 from '../../../../../public/img/icons/custom/gf-landscape.svg'; +import u1148 from '../../../../../public/img/icons/custom/gf-layout-simple.svg'; +import u1149 from '../../../../../public/img/icons/custom/gf-portrait.svg'; +import u1150 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg'; +import u1151 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg'; +import u1152 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg'; +import u1153 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg'; +import u1154 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg'; +import u1155 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg'; +import u1156 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg'; +import u1157 from '../../../../../public/img/icons/custom/gf-logs.svg'; +import u1158 from '../../../../../public/img/icons/custom/gf-movepane-left.svg'; +import u1159 from '../../../../../public/img/icons/custom/gf-movepane-right.svg'; +import u1160 from '../../../../../public/img/icons/mono/favorite.svg'; +import u1161 from '../../../../../public/img/icons/mono/grafana.svg'; +import u1162 from '../../../../../public/img/icons/mono/heart.svg'; +import u1163 from '../../../../../public/img/icons/mono/heart-break.svg'; +import u1164 from '../../../../../public/img/icons/mono/panel-add.svg'; +import u1165 from '../../../../../public/img/icons/mono/library-panel.svg'; +import u1166 from '../../../../../public/img/icons/unicons/record-audio.svg'; // do not edit this list directly // the list of icons live here: @grafana/ui/components/Icon/cached.json @@ -256,111 +257,112 @@ export function initIconCache() { cacheItem(u1058, 'unicons/ellipsis-h.svg'); cacheItem(u1059, 'unicons/envelope.svg'); cacheItem(u1060, 'unicons/exchange-alt.svg'); - cacheItem(u1061, 'unicons/exclamation-triangle.svg'); - cacheItem(u1062, 'unicons/external-link-alt.svg'); - cacheItem(u1063, 'unicons/eye.svg'); - cacheItem(u1064, 'unicons/eye-slash.svg'); - cacheItem(u1065, 'unicons/file-alt.svg'); - cacheItem(u1066, 'unicons/file-blank.svg'); - cacheItem(u1067, 'unicons/filter.svg'); - cacheItem(u1068, 'unicons/folder.svg'); - cacheItem(u1069, 'unicons/folder-open.svg'); - cacheItem(u1070, 'unicons/folder-plus.svg'); - cacheItem(u1071, 'unicons/folder-upload.svg'); - cacheItem(u1072, 'unicons/forward.svg'); - cacheItem(u1073, 'unicons/graph-bar.svg'); - cacheItem(u1074, 'unicons/history.svg'); - cacheItem(u1075, 'unicons/home-alt.svg'); - cacheItem(u1076, 'unicons/import.svg'); - cacheItem(u1077, 'unicons/info.svg'); - cacheItem(u1078, 'unicons/info-circle.svg'); - cacheItem(u1079, 'unicons/k6.svg'); - cacheItem(u1080, 'unicons/key-skeleton-alt.svg'); - cacheItem(u1081, 'unicons/keyboard.svg'); - cacheItem(u1082, 'unicons/link.svg'); - cacheItem(u1083, 'unicons/list-ul.svg'); - cacheItem(u1084, 'unicons/lock.svg'); - cacheItem(u1085, 'unicons/minus.svg'); - cacheItem(u1086, 'unicons/minus-circle.svg'); - cacheItem(u1087, 'unicons/mobile-android.svg'); - cacheItem(u1088, 'unicons/monitor.svg'); - cacheItem(u1089, 'unicons/pause.svg'); - cacheItem(u1090, 'unicons/pen.svg'); - cacheItem(u1091, 'unicons/play.svg'); - cacheItem(u1092, 'unicons/plug.svg'); - cacheItem(u1093, 'unicons/plus.svg'); - cacheItem(u1094, 'unicons/plus-circle.svg'); - cacheItem(u1095, 'unicons/power.svg'); - cacheItem(u1096, 'unicons/presentation-play.svg'); - cacheItem(u1097, 'unicons/process.svg'); - cacheItem(u1098, 'unicons/question-circle.svg'); - cacheItem(u1099, 'unicons/repeat.svg'); - cacheItem(u1100, 'unicons/rocket.svg'); - cacheItem(u1101, 'unicons/rss.svg'); - cacheItem(u1102, 'unicons/save.svg'); - cacheItem(u1103, 'unicons/search.svg'); - cacheItem(u1104, 'unicons/search-minus.svg'); - cacheItem(u1105, 'unicons/search-plus.svg'); - cacheItem(u1106, 'unicons/share-alt.svg'); - cacheItem(u1107, 'unicons/shield.svg'); - cacheItem(u1108, 'unicons/signal.svg'); - cacheItem(u1109, 'unicons/signin.svg'); - cacheItem(u1110, 'unicons/signout.svg'); - cacheItem(u1111, 'unicons/sitemap.svg'); - cacheItem(u1112, 'unicons/slack.svg'); - cacheItem(u1113, 'unicons/sliders-v-alt.svg'); - cacheItem(u1114, 'unicons/sort-amount-down.svg'); - cacheItem(u1115, 'unicons/sort-amount-up.svg'); - cacheItem(u1116, 'unicons/square-shape.svg'); - cacheItem(u1117, 'unicons/star.svg'); - cacheItem(u1118, 'unicons/step-backward.svg'); - cacheItem(u1119, 'unicons/sync.svg'); - cacheItem(u1120, 'unicons/table.svg'); - cacheItem(u1121, 'unicons/tag-alt.svg'); - cacheItem(u1122, 'unicons/times.svg'); - cacheItem(u1123, 'unicons/trash-alt.svg'); - cacheItem(u1124, 'unicons/unlock.svg'); - cacheItem(u1125, 'unicons/upload.svg'); - cacheItem(u1126, 'unicons/user.svg'); - cacheItem(u1127, 'unicons/users-alt.svg'); - cacheItem(u1128, 'unicons/wrap-text.svg'); - cacheItem(u1129, 'unicons/cloud-upload.svg'); - cacheItem(u1130, 'unicons/credit-card.svg'); - cacheItem(u1131, 'unicons/file-copy-alt.svg'); - cacheItem(u1132, 'unicons/fire.svg'); - cacheItem(u1133, 'unicons/hourglass.svg'); - cacheItem(u1134, 'unicons/layer-group.svg'); - cacheItem(u1135, 'unicons/layers-alt.svg'); - cacheItem(u1136, 'unicons/line-alt.svg'); - cacheItem(u1137, 'unicons/list-ui-alt.svg'); - cacheItem(u1138, 'unicons/message.svg'); - cacheItem(u1139, 'unicons/palette.svg'); - cacheItem(u1140, 'unicons/percentage.svg'); - cacheItem(u1141, 'unicons/shield-exclamation.svg'); - cacheItem(u1142, 'unicons/plus-square.svg'); - cacheItem(u1143, 'unicons/x.svg'); - cacheItem(u1144, 'unicons/capture.svg'); - cacheItem(u1145, 'custom/gf-grid.svg'); - cacheItem(u1146, 'custom/gf-landscape.svg'); - cacheItem(u1147, 'custom/gf-layout-simple.svg'); - cacheItem(u1148, 'custom/gf-portrait.svg'); - cacheItem(u1149, 'custom/gf-bar-alignment-after.svg'); - cacheItem(u1150, 'custom/gf-bar-alignment-before.svg'); - cacheItem(u1151, 'custom/gf-bar-alignment-center.svg'); - cacheItem(u1152, 'custom/gf-interpolation-linear.svg'); - cacheItem(u1153, 'custom/gf-interpolation-smooth.svg'); - cacheItem(u1154, 'custom/gf-interpolation-step-after.svg'); - cacheItem(u1155, 'custom/gf-interpolation-step-before.svg'); - cacheItem(u1156, 'custom/gf-logs.svg'); - cacheItem(u1157, 'custom/gf-movepane-left.svg'); - cacheItem(u1158, 'custom/gf-movepane-right.svg'); - cacheItem(u1159, 'mono/favorite.svg'); - cacheItem(u1160, 'mono/grafana.svg'); - cacheItem(u1161, 'mono/heart.svg'); - cacheItem(u1162, 'mono/heart-break.svg'); - cacheItem(u1163, 'mono/panel-add.svg'); - cacheItem(u1164, 'mono/library-panel.svg'); - cacheItem(u1165, 'unicons/record-audio.svg'); + cacheItem(u1061, 'unicons/exclamation-circle.svg'); + cacheItem(u1062, 'unicons/exclamation-triangle.svg'); + cacheItem(u1063, 'unicons/external-link-alt.svg'); + cacheItem(u1064, 'unicons/eye.svg'); + cacheItem(u1065, 'unicons/eye-slash.svg'); + cacheItem(u1066, 'unicons/file-alt.svg'); + cacheItem(u1067, 'unicons/file-blank.svg'); + cacheItem(u1068, 'unicons/filter.svg'); + cacheItem(u1069, 'unicons/folder.svg'); + cacheItem(u1070, 'unicons/folder-open.svg'); + cacheItem(u1071, 'unicons/folder-plus.svg'); + cacheItem(u1072, 'unicons/folder-upload.svg'); + cacheItem(u1073, 'unicons/forward.svg'); + cacheItem(u1074, 'unicons/graph-bar.svg'); + cacheItem(u1075, 'unicons/history.svg'); + cacheItem(u1076, 'unicons/home-alt.svg'); + cacheItem(u1077, 'unicons/import.svg'); + cacheItem(u1078, 'unicons/info.svg'); + cacheItem(u1079, 'unicons/info-circle.svg'); + cacheItem(u1080, 'unicons/k6.svg'); + cacheItem(u1081, 'unicons/key-skeleton-alt.svg'); + cacheItem(u1082, 'unicons/keyboard.svg'); + cacheItem(u1083, 'unicons/link.svg'); + cacheItem(u1084, 'unicons/list-ul.svg'); + cacheItem(u1085, 'unicons/lock.svg'); + cacheItem(u1086, 'unicons/minus.svg'); + cacheItem(u1087, 'unicons/minus-circle.svg'); + cacheItem(u1088, 'unicons/mobile-android.svg'); + cacheItem(u1089, 'unicons/monitor.svg'); + cacheItem(u1090, 'unicons/pause.svg'); + cacheItem(u1091, 'unicons/pen.svg'); + cacheItem(u1092, 'unicons/play.svg'); + cacheItem(u1093, 'unicons/plug.svg'); + cacheItem(u1094, 'unicons/plus.svg'); + cacheItem(u1095, 'unicons/plus-circle.svg'); + cacheItem(u1096, 'unicons/power.svg'); + cacheItem(u1097, 'unicons/presentation-play.svg'); + cacheItem(u1098, 'unicons/process.svg'); + cacheItem(u1099, 'unicons/question-circle.svg'); + cacheItem(u1100, 'unicons/repeat.svg'); + cacheItem(u1101, 'unicons/rocket.svg'); + cacheItem(u1102, 'unicons/rss.svg'); + cacheItem(u1103, 'unicons/save.svg'); + cacheItem(u1104, 'unicons/search.svg'); + cacheItem(u1105, 'unicons/search-minus.svg'); + cacheItem(u1106, 'unicons/search-plus.svg'); + cacheItem(u1107, 'unicons/share-alt.svg'); + cacheItem(u1108, 'unicons/shield.svg'); + cacheItem(u1109, 'unicons/signal.svg'); + cacheItem(u1110, 'unicons/signin.svg'); + cacheItem(u1111, 'unicons/signout.svg'); + cacheItem(u1112, 'unicons/sitemap.svg'); + cacheItem(u1113, 'unicons/slack.svg'); + cacheItem(u1114, 'unicons/sliders-v-alt.svg'); + cacheItem(u1115, 'unicons/sort-amount-down.svg'); + cacheItem(u1116, 'unicons/sort-amount-up.svg'); + cacheItem(u1117, 'unicons/square-shape.svg'); + cacheItem(u1118, 'unicons/star.svg'); + cacheItem(u1119, 'unicons/step-backward.svg'); + cacheItem(u1120, 'unicons/sync.svg'); + cacheItem(u1121, 'unicons/table.svg'); + cacheItem(u1122, 'unicons/tag-alt.svg'); + cacheItem(u1123, 'unicons/times.svg'); + cacheItem(u1124, 'unicons/trash-alt.svg'); + cacheItem(u1125, 'unicons/unlock.svg'); + cacheItem(u1126, 'unicons/upload.svg'); + cacheItem(u1127, 'unicons/user.svg'); + cacheItem(u1128, 'unicons/users-alt.svg'); + cacheItem(u1129, 'unicons/wrap-text.svg'); + cacheItem(u1130, 'unicons/cloud-upload.svg'); + cacheItem(u1131, 'unicons/credit-card.svg'); + cacheItem(u1132, 'unicons/file-copy-alt.svg'); + cacheItem(u1133, 'unicons/fire.svg'); + cacheItem(u1134, 'unicons/hourglass.svg'); + cacheItem(u1135, 'unicons/layer-group.svg'); + cacheItem(u1136, 'unicons/layers-alt.svg'); + cacheItem(u1137, 'unicons/line-alt.svg'); + cacheItem(u1138, 'unicons/list-ui-alt.svg'); + cacheItem(u1139, 'unicons/message.svg'); + cacheItem(u1140, 'unicons/palette.svg'); + cacheItem(u1141, 'unicons/percentage.svg'); + cacheItem(u1142, 'unicons/shield-exclamation.svg'); + cacheItem(u1143, 'unicons/plus-square.svg'); + cacheItem(u1144, 'unicons/x.svg'); + cacheItem(u1145, 'unicons/capture.svg'); + cacheItem(u1146, 'custom/gf-grid.svg'); + cacheItem(u1147, 'custom/gf-landscape.svg'); + cacheItem(u1148, 'custom/gf-layout-simple.svg'); + cacheItem(u1149, 'custom/gf-portrait.svg'); + cacheItem(u1150, 'custom/gf-bar-alignment-after.svg'); + cacheItem(u1151, 'custom/gf-bar-alignment-before.svg'); + cacheItem(u1152, 'custom/gf-bar-alignment-center.svg'); + cacheItem(u1153, 'custom/gf-interpolation-linear.svg'); + cacheItem(u1154, 'custom/gf-interpolation-smooth.svg'); + cacheItem(u1155, 'custom/gf-interpolation-step-after.svg'); + cacheItem(u1156, 'custom/gf-interpolation-step-before.svg'); + cacheItem(u1157, 'custom/gf-logs.svg'); + cacheItem(u1158, 'custom/gf-movepane-left.svg'); + cacheItem(u1159, 'custom/gf-movepane-right.svg'); + cacheItem(u1160, 'mono/favorite.svg'); + cacheItem(u1161, 'mono/grafana.svg'); + cacheItem(u1162, 'mono/heart.svg'); + cacheItem(u1163, 'mono/heart-break.svg'); + cacheItem(u1164, 'mono/panel-add.svg'); + cacheItem(u1165, 'mono/library-panel.svg'); + cacheItem(u1166, 'unicons/record-audio.svg'); // do not edit this list directly // the list of icons live here: @grafana/ui/components/Icon/cached.json } diff --git a/public/app/features/alerting/unified/Receivers.tsx b/public/app/features/alerting/unified/Receivers.tsx index 6eff867f0f1..68cebae6705 100644 --- a/public/app/features/alerting/unified/Receivers.tsx +++ b/public/app/features/alerting/unified/Receivers.tsx @@ -38,13 +38,11 @@ function NotificationError({ errorCount }: NotificationErrorProps) { const styles = useStyles2(getStyles); return ( - <div className={styles.warning} data-testid="receivers-notification-error"> - <Stack alignItems="flex-end" direction="column"> - <Stack alignItems="center"> - <Icon name="exclamation-triangle" /> - <div className={styles.countMessage}> - {`${errorCount} ${pluralize('error', errorCount)} with contact points`} - </div> + <div className={styles.error} data-testid="receivers-notification-error"> + <Stack alignItems="flex-end" direction="column" gap={0}> + <Stack alignItems="center" gap={1}> + <Icon name="exclamation-circle" /> + <div>{`${errorCount} ${pluralize('error', errorCount)} with contact points`}</div> </Stack> <div>{'Some alert notifications might not be delivered'}</div> </Stack> @@ -214,11 +212,8 @@ function getPageNavigationModel(type: PageType | undefined, id: string | undefin export default withErrorBoundary(Receivers, { style: 'page' }); const getStyles = (theme: GrafanaTheme2) => ({ - warning: css` - color: ${theme.colors.warning.text}; - `, - countMessage: css` - padding-left: 10px; + error: css` + color: ${theme.colors.error.text}; `, headingContainer: css` display: flex; diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx index 9a2937f9286..44120922d81 100644 --- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx +++ b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx @@ -90,8 +90,10 @@ interface ReceiverErrorProps { function ReceiverError({ errorCount, errorDetail, showErrorCount, tooltip }: ReceiverErrorProps) { const text = showErrorCount ? `${errorCount} ${pluralize('error', errorCount)}` : 'Error'; const tooltipToRender = tooltip ?? errorDetail ?? 'Error'; - return <Badge color="orange" icon="exclamation-triangle" text={text} tooltip={tooltipToRender} />; + + return <Badge color="red" icon="exclamation-circle" text={text} tooltip={tooltipToRender} />; } + interface NotifierHealthProps { errorsByNotifier: number; errorDetail?: string; @@ -99,13 +101,18 @@ interface NotifierHealthProps { } function NotifierHealth({ errorsByNotifier, errorDetail, lastNotify }: NotifierHealthProps) { - const noErrorsColor = isLastNotifyNullDate(lastNotify) ? 'orange' : 'green'; - const noErrorsText = isLastNotifyNullDate(lastNotify) ? 'No attempts' : 'OK'; - return errorsByNotifier > 0 ? ( - <ReceiverError errorCount={errorsByNotifier} errorDetail={errorDetail} showErrorCount={false} /> - ) : ( - <Badge color={noErrorsColor} text={noErrorsText} tooltip="" /> - ); + const hasErrors = errorsByNotifier > 0; + const noAttempts = isLastNotifyNullDate(lastNotify); + + if (hasErrors) { + return <ReceiverError errorCount={errorsByNotifier} errorDetail={errorDetail} showErrorCount={false} />; + } + + if (noAttempts) { + return <>No attempts</>; + } + + return <Badge color="green" text="OK" />; } interface ReceiverHealthProps { @@ -114,17 +121,23 @@ interface ReceiverHealthProps { } function ReceiverHealth({ errorsByReceiver, someWithNoAttempt }: ReceiverHealthProps) { - const noErrorsColor = someWithNoAttempt ? 'orange' : 'green'; - const noErrorsText = someWithNoAttempt ? 'No attempts' : 'OK'; - return errorsByReceiver > 0 ? ( - <ReceiverError - errorCount={errorsByReceiver} - showErrorCount={true} - tooltip="Expand the contact point to see error details." - /> - ) : ( - <Badge color={noErrorsColor} text={noErrorsText} tooltip="" /> - ); + const hasErrors = errorsByReceiver > 0; + + if (hasErrors) { + return ( + <ReceiverError + errorCount={errorsByReceiver} + showErrorCount={true} + tooltip="Expand the contact point to see error details." + /> + ); + } + + if (someWithNoAttempt) { + return <>No attempts</>; + } + + return <Badge color="green" text="OK" />; } const useContactPointsState = (alertManagerName: string) => {