maybe it's namespace issues

2 files changed, 5 insertions, 62 deletions

diff --git a/tools/monitoring/templates/network-policy.yaml b/tools/monitoring/templates/network-policy.yaml
deleted file mode 100644
index b50c3af..0000000
--- a/tools/monitoring/templates/network-policy.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-all-internal
-  namespace: monitoring
-spec:
-  podSelector: {}
-  policyTypes:
-    - Ingress
-    - Egress
-  ingress:
-    - from:
-        - podSelector: {}
-  egress:
-    - to:
-        - podSelector: {}
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-ingress-to-grafana
-  namespace: monitoring
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: grafana
-  policyTypes:
-    - Ingress
-  ingress:
-    - from:
-        - namespaceSelector:
-            matchLabels:
-              name: kube-system
-        - podSelector:
-            matchLabels:
-              app: traefik
-        - {}
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-external-ingress-to-grafana
-  namespace: monitoring
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: grafana
-  policyTypes:
-    - Ingress
-  ingress:
-    - from: 
-        - ipBlock:
-            cidr: 0.0.0.0/0
-  egress:
-    - to:
-        - podSelector: {}
-
diff --git a/tools/monitoring/values.yaml b/tools/monitoring/values.yaml
index af00d73..0ad09e3 100644
--- a/tools/monitoring/values.yaml
+++ b/tools/monitoring/values.yaml
@@ -1,5 +1,5 @@
 global:
-  namespace: monitoring
+  namespace: default
 
 grafana:
   ingress:
@@ -25,12 +25,12 @@ grafana:
         - name: Prometheus
           type: prometheus
           access: proxy
-          url: http://prometheus-server.monitoring.svc.cluster.local
+          url: http://prometheus-server.default.svc.cluster.local
           isDefault: true
         - name: Elasticsearch
           type: elasticsearch
           access: proxy
-          url: http://elasticsearch-master.monitoring.svc.cluster.local:9200
+          url: http://elasticsearch-master.default.svc.cluster.local:9200
           jsonData:
             esVersion: 7
             timeField: "@timestamp"
@@ -91,11 +91,11 @@ opentelemetry-collector:
       batch: {}
     exporters:
       prometheusremotewrite:
-        endpoint: "http://prometheus-server.monitoring.svc.cluster.local/api/v1/write"
+        endpoint: "http://prometheus-server.default.svc.cluster.local/api/v1/write"
       logging:
         loglevel: debug
       otlp:
-        endpoint: "http://logstash.monitoring.svc.cluster.local:5044"
+        endpoint: "http://logstash.default.svc.cluster.local:5044"
         tls:
           insecure: true
     service: