Skip to content

Commit

Permalink
Merge pull request #20 from vshn/fix/prometheus_lens_integration
Browse files Browse the repository at this point in the history
Don't use paths for Alertmanager and Prometheus
  • Loading branch information
Kidswiss authored May 17, 2024
2 parents 1095c7b + 1948786 commit 70f566c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ $(prometheus_sentinel): kind-setup-ingress
--values prometheus/values.yaml \
prometheus-community/kube-prometheus-stack
kubectl -n prometheus-system wait --for condition=Available deployment/kube-prometheus-kube-prome-operator --timeout 120s
@echo -e "***\n*** Installed Prometheus in http://127.0.0.1.nip.io:8088/prometheus/ and AlertManager in http://127.0.0.1.nip.io:8088/alertmanager/.\n***"
@echo -e "***\n*** Installed Prometheus in http://prometheus.127.0.0.1.nip.io:8088/ and AlertManager in http://alertmanager.127.0.0.1.nip.io:8088/.\n***"
@touch $@

load-comp-image: ## Load the appcat-comp image if it exists
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ The kind cluster features an ingress controller, that listens on `:8088`.

Currently following apps are configured to use the ingress:

- Promethues: http://127.0.0.1.nip.io:8088/prometheus/
- Alertmanager: http://127.0.0.1.nip.io:8088/alertmanager/
- Promethues: http://prometheus.127.0.0.1.nip.io:8088/
- Alertmanager: http://alertmanager.127.0.0.1.nip.io:8088/
- Minio: http://minio.127.0.0.1.nip.io:8088/
- [Komoplane](https://github.com/komodorio/komoplane) (make komoplane-setup): http://komoplane.127.0.0.1.nip.io:8088/

Expand Down
11 changes: 2 additions & 9 deletions prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,21 @@ grafana:
enabled: false

alertmanager:
alertmanagerSpec:
routePrefix: /alertmanager/
ingress:
enabled: true
hosts:
- 127.0.0.1.nip.io
paths:
- /alertmanager/
- alertmanager.127.0.0.1.nip.io

prometheus:
prometheusSpec:
routePrefix: /prometheus/
# these will cause Prometheus to search in all namespaces
serviceMonitorSelectorNilUsesHelmValues: false
ruleSelectorNilUsesHelmValues: false
podMonitorSelectorNilUsesHelmValues: false
ingress:
enabled: true
hosts:
- 127.0.0.1.nip.io
paths:
- /prometheus/
- prometheus.127.0.0.1.nip.io

# See https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-state-metrics
kube-state-metrics:
Expand Down

0 comments on commit 70f566c

Please sign in to comment.