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.

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

Remove deprecated monitoring configs #4478

Merged
merged 2 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 0 additions & 27 deletions .github/workflows/e2e-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,33 +63,6 @@ jobs:
kubectl -n flux-system wait kustomization/tenants --for=condition=ready --timeout=5m
kubectl -n apps wait kustomization/dev-team --for=condition=ready --timeout=1m
kubectl -n apps wait helmrelease/podinfo --for=condition=ready --timeout=1m
- name: Run monitoring tests
# Keep this test in sync with https://fluxcd.io/flux/guides/monitoring/
env:
KUBECONFIG: /tmp/${{ steps.prep.outputs.CLUSTER }}
run: |
./bin/flux create source git flux-monitoring \
--interval=30m \
--url=https://github.com/fluxcd/flux2 \
--branch=${GITHUB_REF#refs/heads/}
./bin/flux create kustomization kube-prometheus-stack \
--interval=1h \
--prune \
--source=flux-monitoring \
--path="./manifests/monitoring/kube-prometheus-stack" \
--health-check-timeout=5m \
--wait
./bin/flux create kustomization monitoring-config \
--depends-on=kube-prometheus-stack \
--interval=1h \
--prune=true \
--source=flux-monitoring \
--path="./manifests/monitoring/monitoring-config" \
--health-check-timeout=1m \
--wait
kubectl -n flux-system wait kustomization/kube-prometheus-stack --for=condition=ready --timeout=5m
kubectl -n flux-system wait kustomization/monitoring-config --for=condition=ready --timeout=5m
kubectl -n monitoring wait helmrelease/kube-prometheus-stack --for=condition=ready --timeout=1m
- name: Debug failure
if: failure()
env:
Expand Down
12 changes: 7 additions & 5 deletions manifests/monitoring/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# :warning: Deprecation Notice
# :warning: Removal Notice

Starting Flux v2.1.0, released August 24, 2023, the Flux monitoring
configurations in this repository will be marked as deprecated. New monitoring
configurations in this repository were marked as deprecated. The new monitoring
docs are available at [Flux monitoring](https://fluxcd.io/flux/monitoring/)
docs with new example configurations in
[fluxcd/flux2-monitoring-example](https://github.com/fluxcd/flux2-monitoring-example/).
The deprecated configurations will be removed in a future release of Flux. All
users of these configurations are recommended to use the new monitoring setup,
following the docs and the new examples.

The deprecated configurations were removed in Flux v2.2 on December 13, 2023. All
users of these configurations are advised to use the new monitoring setup,
following the [docs](https://fluxcd.io/flux/monitoring/) and the
[examples](https://github.com/fluxcd/flux2-monitoring-example/).

After collecting a lot of user feedback about our monitoring recommendation, in
order to serve most of the needs of the users, we decided to create a new
Expand Down
7 changes: 0 additions & 7 deletions manifests/monitoring/kube-prometheus-stack/kustomization.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions manifests/monitoring/kube-prometheus-stack/namespace.yaml

This file was deleted.

51 changes: 0 additions & 51 deletions manifests/monitoring/kube-prometheus-stack/release.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions manifests/monitoring/kube-prometheus-stack/repository.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions manifests/monitoring/loki-stack/kustomization.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions manifests/monitoring/loki-stack/release.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions manifests/monitoring/loki-stack/repository.yaml

This file was deleted.

Loading
Loading