Removing comments

manifests/grafana-deployment.yaml

@@ -85,6 +85,9 @@ spec:
         - mountPath: /grafana-dashboard-definitions/0/namespace-by-workload
           name: grafana-dashboard-namespace-by-workload
           readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/nginx-dashboard
+          name: grafana-dashboard-nginx-dashboard
+          readOnly: false
         - mountPath: /grafana-dashboard-definitions/0/node-cluster-rsrc-use
           name: grafana-dashboard-node-cluster-rsrc-use
           readOnly: false
@@ -181,6 +184,9 @@ spec:
       - configMap:
           name: grafana-dashboard-namespace-by-workload
         name: grafana-dashboard-namespace-by-workload
+      - configMap:
+          name: grafana-dashboard-nginx-dashboard
+        name: grafana-dashboard-nginx-dashboard
       - configMap:
           name: grafana-dashboard-node-cluster-rsrc-use
         name: grafana-dashboard-node-cluster-rsrc-use

manifests/ingress-alertmanager.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: alertmanager.192.168.1.15.nip.io
+  - host: alertmanager.192.168.4.32.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - alertmanager.192.168.1.15.nip.io
+    - alertmanager.192.168.4.32.nip.io

manifests/ingress-grafana.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: grafana.192.168.1.15.nip.io
+  - host: grafana.192.168.4.32.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - grafana.192.168.1.15.nip.io
+    - grafana.192.168.4.32.nip.io

manifests/ingress-prometheus.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: prometheus.192.168.1.15.nip.io
+  - host: prometheus.192.168.4.32.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - prometheus.192.168.1.15.nip.io
+    - prometheus.192.168.4.32.nip.io

manifests/nginxexporter-clusterRole.yaml

@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: nginx-exporter
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch

manifests/nginxexporter-clusterRoleBinding.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: nginx-exporter
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: nginx-exporter
+subjects:
+- kind: ServiceAccount
+  name: nginx-exporter
+  namespace: monitoring

manifests/nginxexporter-service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+  name: nginx-ingress-metrics
+  namespace: ingress-nginx
+spec:
+  clusterIP: None
+  ports:
+  - name: prometheus
+    port: 10254
+    targetPort: 10254
+  selector:
+    app.kubernetes.io/name: ingress-nginx

manifests/nginxexporter-serviceAccount.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: nginx-exporter
+  namespace: monitoring

manifests/nginxexporter-serviceMonitor.yaml

@@ -0,0 +1,26 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: nginx
+  name: nginx
+  namespace: monitoring
+spec:
+  endpoints:
+  - interval: 30s
+    port: prometheus
+    relabelings:
+    - action: replace
+      regex: (.*)
+      replacement: $1
+      sourceLabels:
+      - __meta_kubernetes_pod_node_name
+      targetLabel: instance
+    scheme: http
+  jobLabel: nginx-exporter
+  namespaceSelector:
+    matchNames:
+    - ingress-nginx
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: ingress-nginx

manifests/prometheus-prometheus.yaml

@@ -25,7 +25,7 @@ spec:
     - name: alertmanager-main
       namespace: monitoring
       port: web
-  externalUrl: http://prometheus.192.168.1.15.nip.io
+  externalUrl: http://prometheus.192.168.4.32.nip.io
   image: prom/prometheus:v2.19.1
   nodeSelector:
     kubernetes.io/os: linux

modules/nginx.jsonnet

@@ -4,7 +4,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 {
   _config+:: {
     namespace: 'monitoring',
-    // Add custom dashboards
     grafanaDashboards+:: {
       'nginx-dashboard.json': (import '../grafana-dashboards/nginx-dashboard.json'),
     },
@@ -20,7 +19,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       local nginxPort = servicePort.newNamed('prometheus', 10254, 10254);
 
       service.new('nginx-ingress-metrics', {'app.kubernetes.io/name': 'ingress-nginx'}, nginxPort) +
-      service.mixin.metadata.withNamespace('nginx-ingress') +
+      service.mixin.metadata.withNamespace('ingress-nginx') +
       service.mixin.metadata.withLabels({'app.kubernetes.io/name': 'ingress-nginx'}) +
       service.mixin.spec.withClusterIp('None'),
 
@@ -37,8 +36,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     serviceAccount:
       utils.newServiceAccount('nginx-exporter', $._config.namespace, null),
 
-
-    // Creates a ClusterRoleBinding between a `clusterRole` and a `serviceAccount` on `serviceAccountNamespace`
     clusterRoleBinding:
       utils.newClusterRoleBinding('nginx-exporter', 'nginx-exporter', $._config.namespace, 'nginx-exporter', null),
 

vars.jsonnet

@@ -44,11 +44,11 @@
 
   k3s: {
     enabled: false,
-    master_ip: ['192.168.1.15'],
+    master_ip: ['192.168.4.32'],
   },
 
   // Domain suffix for the ingresses
-  suffixDomain: '192.168.1.15.nip.io',
+  suffixDomain: '192.168.4.32.nip.io',
   // If TLSingress is true, a self-signed HTTPS ingress with redirect will be created
   TLSingress: true,
   // If UseProvidedCerts is true, provided files will be used on created HTTPS ingresses.