diff --git a/kubernetes/deployments/deployment.yaml b/kubernetes/deployments/deployment.yaml index 1e68a69..e761f82 100644 --- a/kubernetes/deployments/deployment.yaml +++ b/kubernetes/deployments/deployment.yaml @@ -26,12 +26,12 @@ spec: imagePullPolicy: Always ports: - containerPort: 5000 - livenessProbe: - httpGet: - path: /status - port: 5000 - initialDelaySeconds: 3 - periodSeconds: 3 + # livenessProbe: + # httpGet: + # path: /status + # port: 5000 + # initialDelaySeconds: 3 + # periodSeconds: 3 resources: requests: memory: "64Mi" diff --git a/kubernetes/services/service.yaml b/kubernetes/services/service.yaml index eec4232..de00471 100644 --- a/kubernetes/services/service.yaml +++ b/kubernetes/services/service.yaml @@ -2,10 +2,14 @@ apiVersion: v1 kind: Service metadata: name: example-service + labels: + app: example-app spec: + type: LoadBalancer selector: app: example-app ports: - protocol: TCP + name: http port: 80 targetPort: 5000 \ No newline at end of file diff --git a/prometheus-monitoring/kubernetes-1.14.8/grafana/grafana-deployment.yaml b/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/grafana/grafana-deployment.yaml rename to prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-deployment.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/grafana/grafana-service.yaml b/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/grafana/grafana-service.yaml rename to prometheus-monitoring/kubernetes/1.14.8/grafana/grafana-service.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/grafana/grafana.configmap.yaml b/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.configmap.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/grafana/grafana.configmap.yaml rename to prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.configmap.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/grafana/grafana.dashboards.configmap.yaml b/prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/grafana/grafana.dashboards.configmap.yaml rename to prometheus-monitoring/kubernetes/1.14.8/grafana/grafana.dashboards.configmap.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/node-exporter/node-exporter.yaml b/prometheus-monitoring/kubernetes/1.14.8/node-exporter/node-exporter.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/node-exporter/node-exporter.yaml rename to prometheus-monitoring/kubernetes/1.14.8/node-exporter/node-exporter.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/node-exporter/service-monitor.yaml b/prometheus-monitoring/kubernetes/1.14.8/node-exporter/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/node-exporter/service-monitor.yaml rename to prometheus-monitoring/kubernetes/1.14.8/node-exporter/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/cluster-role.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/cluster-role.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.rules.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.service.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/prometheus.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/prometheus.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/service-account.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-cluster-monitoring/service-account.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-cluster-monitoring/service-account.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/cluster-role-binding.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/cluster-role-binding.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role-binding.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/cluster-role.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/cluster-role.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/cluster-role.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/deployment.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/deployment.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/deployment.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/deployment.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service-account.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-account.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service-account.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-account.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service-monitor.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service-monitor.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service-monitor.yaml diff --git a/prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service.yaml similarity index 100% rename from prometheus-monitoring/kubernetes-1.14.8/prometheus-operator/service.yaml rename to prometheus-monitoring/kubernetes/1.14.8/prometheus-operator/service.yaml diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml new file mode 100644 index 0000000..61f7aac --- /dev/null +++ b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/apps.service-monitor.yaml @@ -0,0 +1,18 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: apps + labels: + prometheus: prometheus-standalone + k8s-app: apps +spec: + jobLabel: apps + selector: + matchLabels: + app: example-app + namespaceSelector: + matchNames: + - apps + endpoints: + - port: http + interval: 30s \ No newline at end of file diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml new file mode 100644 index 0000000..96c8c00 --- /dev/null +++ b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role-binding.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: prometheus-standalone +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: prometheus-standalone +subjects: +- kind: ServiceAccount + name: prometheus-standalone + namespace: apps diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml new file mode 100644 index 0000000..f1d6c57 --- /dev/null +++ b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/cluster-role.yaml @@ -0,0 +1,17 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: prometheus-standalone +rules: +- apiGroups: [""] + resources: + - services + - endpoints + - pods + verbs: ["get", "list", "watch"] +- apiGroups: [""] + resources: + - configmaps + verbs: ["get"] +- nonResourceURLs: ["/metrics"] + verbs: ["get"] \ No newline at end of file diff --git a/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml new file mode 100644 index 0000000..1f5f2c4 --- /dev/null +++ b/prometheus-monitoring/kubernetes/1.14.8/prometheus-standalone/prometheus.yaml @@ -0,0 +1,33 @@ +apiVersion: monitoring.coreos.com/v1 +kind: Prometheus +metadata: + name: prometheus-standalone + labels: + prometheus: k8s +spec: + externalLabels: + cluster: docker-desktop + replicas: 1 + version: v2.13.1 + serviceAccountName: prometheus-standalone + serviceMonitorSelector: + matchExpressions: + - key: k8s-app + operator: In + values: + - apps + # - kube-state-metrics + # - apiserver + # - kubelet + # ruleSelector: + # matchLabels: + # role: alert-rules + # prometheus: k8s + # resources: + # requests: + # memory: 400Mi +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: prometheus-standalone