Skip to content

Commit 8765c48

Browse files
gillesdemeyJacobsonMTsoniaAguilarPeironarmandgrilletrwwiv
authored
Alerting: Remove legacy alerting (#83671)
Removes legacy alerting, so long and thanks for all the fish! 🐟 --------- Co-authored-by: Matthew Jacobson <[email protected]> Co-authored-by: Sonia Aguilar <[email protected]> Co-authored-by: Armand Grillet <[email protected]> Co-authored-by: William Wernert <[email protected]> Co-authored-by: Yuri Tseretyan <[email protected]>
1 parent f26344e commit 8765c48

File tree

298 files changed

+731
-45316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+731
-45316
lines changed

β€Ž.betterer.results

+1-174
Large diffs are not rendered by default.

β€Ž.github/CODEOWNERS

-4
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171

172172
/devenv/bulk-dashboards/ @grafana/dashboards-squad
173173
/devenv/bulk-folders/ @grafana/grafana-frontend-platform
174-
/devenv/bulk_alerting_dashboards/ @grafana/alerting-backend-product
175174
/devenv/create_docker_compose.sh @grafana/backend-platform
176175
/devenv/dashboards.yaml @grafana/dashboards-squad
177176
/devenv/datasources.yaml @grafana/backend-platform
@@ -283,7 +282,6 @@
283282
# Alerting
284283
/pkg/services/ngalert/ @grafana/alerting-backend-product
285284
/pkg/services/sqlstore/migrations/ualert/ @grafana/alerting-backend-product
286-
/pkg/services/alerting/ @grafana/alerting-backend-product
287285
/pkg/tests/api/alerting/ @grafana/alerting-backend-product
288286
/public/app/features/alerting/ @grafana/alerting-frontend
289287

@@ -436,7 +434,6 @@ playwright.config.ts @grafana/plugins-platform-frontend
436434
/public/app/features/transformers/timeSeriesTable/ @grafana/dataviz-squad @grafana/app-o11y-visualizations
437435
/public/app/features/users/ @grafana/identity-access-team
438436
/public/app/features/variables/ @grafana/dashboards-squad
439-
/public/app/plugins/panel/alertGroups/ @grafana/alerting-frontend
440437
/public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
441438
/public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
442439
/public/app/plugins/panel/barchart/ @grafana/dataviz-squad
@@ -711,5 +708,4 @@ embed.go @grafana/grafana-as-code
711708
/conf/provisioning/alerting/ @grafana/alerting-backend-product
712709
/conf/provisioning/dashboards/ @grafana/dashboards-squad
713710
/conf/provisioning/datasources/ @grafana/plugins-platform-backend
714-
/conf/provisioning/notifiers/ @bergquist
715711
/conf/provisioning/plugins/ @grafana/plugins-platform-backend

β€Ž.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ pkg/services/quota/quotaimpl/storage/storage.json
131131

132132
/devenv/bulk-dashboards/*.json
133133
/devenv/bulk-folders/*/*.json
134-
/devenv/bulk_alerting_dashboards/*.json
135134
/devenv/datasources_bulk.yaml
136-
/devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml
137135

138136
/scripts/build/release_publisher/release_publisher
139137
*.patch

β€Žconf/defaults.ini

+1-12
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ app_mode = production
99
# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
1010
instance_name = ${HOSTNAME}
1111

12-
# force migration will run migrations that might cause dataloss
13-
# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
14-
force_migration = false
15-
1612
#################################### Paths ###############################
1713
[paths]
1814
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -1139,7 +1135,7 @@ alerting_rule_group_rules = 100
11391135

11401136
#################################### Unified Alerting ####################
11411137
[unified_alerting]
1142-
# Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
1138+
# Enable the Alerting sub-system and interface.
11431139
enabled =
11441140

11451141
# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
@@ -1324,13 +1320,6 @@ max_age =
13241320
# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
13251321
max_annotations_to_keep =
13261322

1327-
[unified_alerting.upgrade]
1328-
# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
1329-
# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
1330-
# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
1331-
# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
1332-
clean_upgrade = false
1333-
13341323
# NOTE: this configuration options are not used yet.
13351324
[remote.alertmanager]
13361325

β€Žconf/provisioning/notifiers/sample.yaml

-25
This file was deleted.

β€Žconf/sample.ini

-11
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
1010
;instance_name = ${HOSTNAME}
1111

12-
# force migration will run migrations that might cause dataloss
13-
# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
14-
;force_migration = false
15-
1612
#################################### Paths ####################################
1713
[paths]
1814
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -1215,13 +1211,6 @@ max_age =
12151211
# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
12161212
max_annotations_to_keep =
12171213

1218-
[unified_alerting.upgrade]
1219-
# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
1220-
# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
1221-
# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
1222-
# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
1223-
;clean_upgrade = false
1224-
12251214
#################################### Annotations #########################
12261215
[annotations]
12271216
# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.

β€Ždevenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml

-9
This file was deleted.

β€Ždevenv/bulk_alerting_dashboards/dashboard.libsonnet

-169
This file was deleted.

β€Ždevenv/bulk_alerting_dashboards/datasources.jsonnet

-14
This file was deleted.

0 commit comments

Comments
Β (0)