Rearrange files and dependencies

This commit is contained in:
CarlosEDP 2019-02-27 09:28:00 -03:00
parent bc48a2313c
commit afd3dbcd64
8 changed files with 307 additions and 292 deletions

View File

@ -1,7 +1,5 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'image_sources_versions.jsonnet') +
{
_config+:: {
namespace: 'monitoring',
@ -81,6 +79,4 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
service.mixin.metadata.withLabels({ 'k8s-app': 'arm-exporter' }) +
service.mixin.spec.withClusterIp('None'),
},
};
{ ['arm-exporter-' + name]: kp.armExporter[name] for name in std.objectFields(kp.armExporter) }
}

196
base_operator_stack.jsonnet Normal file
View File

@ -0,0 +1,196 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
{
_config+:: {
namespace: "monitoring",
urls+:: {
prom_ingress: 'prometheus.internal.carlosedp.com',
alert_ingress: 'alertmanager.internal.carlosedp.com',
grafana_ingress: 'grafana.internal.carlosedp.com',
grafana_ingress_external: 'grafana.cloud.carlosedp.com',
},
prometheus+:: {
names: 'k8s',
replicas: 1,
namespaces: ["default", "kube-system", "monitoring", "logging", "metallb-system"],
},
alertmanager+:: {
replicas: 1,
},
kubeStateMetrics+:: {
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
scrapeTimeout: '30s',
baseCPU: '100m',
baseMemory: '150Mi',
cpuPerNode: '2m',
memoryPerNode: '30Mi',
},
// Add custom Grafana dashboards
grafanaDashboards+:: {
'kubernetes-cluster-dashboard.json': (import 'grafana-dashboards/kubernetes-cluster-dashboard.json'),
'prometheus-dashboard.json': (import 'grafana-dashboards/prometheus-dashboard.json'),
'coredns-dashboard.json': (import 'grafana-dashboards/coredns-dashboard.json'),
},
grafana+:: {
config: {
sections: {
// database: { path: '/data/grafana.db' },
// paths: {
// data: '/var/lib/grafana',
// logs: '/var/lib/grafana/log',
// plugins: '/var/lib/grafana/plugins',
// provisioning: '/etc/grafana/provisioning',
// },
session: { provider: 'memory' },
'auth.basic': {enabled: false},
'auth.anonymous': {enabled: false},
smtp: {
enabled: true,
host: 'smtp-server.monitoring.svc:25',
user: '',
password: '',
from_address:'carlosedp@gmail.com',
from_name: 'Grafana Alert',
skip_verify: true
},
},
},
},
},
//---------------------------------------
// End of _config
//---------------------------------------
prometheus+:: {
local pvc = k.core.v1.persistentVolumeClaim,
prometheus+: {
spec+: {
retention: '15d',
externalUrl: 'http://' + $._config.urls.prom_ingress,
storage: {
volumeClaimTemplate:
pvc.new() +
pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
pvc.mixin.spec.resources.withRequests({ storage: '20Gi' })
# Uncomment below to define a StorageClass name
#+ pvc.mixin.spec.withStorageClassName('nfs-master-ssd'),
},
},
},
},
# Override deployment for Grafana data persistence
grafana+:: {
deployment+: {
spec+: {
template+: {
spec+: {
volumes:
std.map(
function(v)
if v.name == 'grafana-storage' then
{'name':'grafana-storage',
'persistentVolumeClaim': {
'claimName': 'grafana-storage'}
}
else v,
super.volumes
),
},
},
},
},
storage:
local pvc = k.core.v1.persistentVolumeClaim;
pvc.new() +
pvc.mixin.metadata.withNamespace($._config.namespace) +
pvc.mixin.metadata.withName("grafana-storage") +
pvc.mixin.spec.withAccessModes('ReadWriteMany') +
pvc.mixin.spec.resources.withRequests({ storage: '2Gi' }),
},
grafanaDashboards+:: $._config.grafanaDashboards,
// Create ingress objects per application
ingress+: {
local secret = k.core.v1.secret,
local ingress = k.extensions.v1beta1.ingress,
local ingressTls = ingress.mixin.spec.tlsType,
local ingressRule = ingress.mixin.spec.rulesType,
local httpIngressPath = ingressRule.mixin.http.pathsType,
'alertmanager-main':
ingress.new() +
ingress.mixin.metadata.withName('alertmanager-main') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.alert_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('alertmanager-main') +
httpIngressPath.mixin.backend.withServicePort('web')
),
),
'grafana':
ingress.new() +
ingress.mixin.metadata.withName('grafana') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.grafana_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('grafana') +
httpIngressPath.mixin.backend.withServicePort('http')
),
),
'prometheus-k8s':
ingress.new() +
ingress.mixin.metadata.withName('prometheus-k8s') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.prom_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('prometheus-k8s') +
httpIngressPath.mixin.backend.withServicePort('web')
),
),
// // Example external ingress with authentication
// 'grafana-external':
// ingress.new() +
// ingress.mixin.metadata.withName('grafana-external') +
// ingress.mixin.metadata.withNamespace($._config.namespace) +
// ingress.mixin.metadata.withLabels({'traffic-type': 'external'}) +
// ingress.mixin.metadata.withAnnotations({
// 'ingress.kubernetes.io/auth-type': 'basic',
// 'ingress.kubernetes.io/auth-secret': 'basic-auth',
// }) +
// ingress.mixin.spec.withRules(
// ingressRule.new() +
// ingressRule.withHost($._config.urls.grafana_ingress_external) +
// ingressRule.mixin.http.withPaths(
// httpIngressPath.new() +
// httpIngressPath.withPath('/') +
// httpIngressPath.mixin.backend.withServiceName('grafana') +
// httpIngressPath.mixin.backend.withServicePort('http')
// ),
// ),
// 'basic-auth-secret':
// // First generate the auth secret with gen_auth.sh script
// secret.new('basic-auth', { auth: std.base64(importstr 'auth') }) +
// secret.mixin.metadata.withNamespace($._config.namespace),
},
}

View File

@ -14,6 +14,7 @@
prometheusConfigReloader: "v0.28.0",
armExporter: 'latest',
smtpServer: 'v1.0.1',
elasticExporter: '1.0.4rc1'
},
imageRepos+:: {
@ -30,6 +31,7 @@
prometheusConfigReloader: "carlosedp/prometheus-config-reloader",
armExporter: 'carlosedp/arm_exporter',
smtpServer: 'carlosedp/docker-smtp',
elasticExporter: 'carlosedp/elasticsearch-exporter'
},
},
}

View File

@ -1,5 +1,45 @@
(import 'operator_stack.jsonnet') +
(import 'arm_exporter.jsonnet') +
(import 'smtp_server.jsonnet') +
(import 'metallb.jsonnet') +
(import 'traefik.jsonnet')
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
// Enable or disable additional modules
local installModules = { 'arm-exporter': true,
'metallb': true,
'traefik': true,
'ups-exporter': true,
'elastic-exporter': true,
};
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet')
+ (import 'image_sources_versions.jsonnet')
+ (import 'base_operator_stack.jsonnet')
+ (import 'smtp_server.jsonnet')
// Additional Modules
+ (if installModules['arm-exporter'] then (import 'arm_exporter.jsonnet') else {})
+ (if installModules['metallb'] then (import 'metallb.jsonnet') else {})
+ (if installModules['traefik'] then (import 'traefik.jsonnet') else {})
+ (if installModules['ups-exporter'] then (import 'ups_exporter.jsonnet') else {})
+ (if installModules['elastic-exporter'] then (import 'elasticsearch_exporter.jsonnet') else {});
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) }
{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } +
{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } +
{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } +
{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } +
{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } +
{ ['ingress-' + name]: kp.ingress[name] for name in std.objectFields(kp.ingress) } +
{ ['smtp-server-' + name]: kp.smtpServer[name] for name in std.objectFields(kp.smtpServer) } +
// Additional Modules
(if installModules['arm-exporter'] then
{ ['arm-exporter-' + name]: kp.armExporter[name] for name in std.objectFields(kp.armExporter) } else {}) +
(if installModules['metallb'] then
{ ['metallb-' + name]: kp.metallb[name] for name in std.objectFields(kp.metallb) } else {}) +
(if installModules['traefik'] then
{ ['traefik-' + name]: kp.traefik[name] for name in std.objectFields(kp.traefik) } else {}) +
(if installModules['ups-exporter'] then
{ ['ups-exporter-' + name]: kp.upsExporter[name] for name in std.objectFields(kp.upsExporter) } else {}) +
(if installModules['elastic-exporter'] then
{ ['elasticexporter-' + name]: kp.elasticExporter[name] for name in std.objectFields(kp.elasticExporter)} else {})

View File

@ -1,7 +1,5 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'image_sources_versions.jsonnet') +
{
_config+:: {
namespace: 'monitoring',
@ -45,7 +43,6 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
service:
local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType;
local metallbPort = servicePort.newNamed('http', 7472, 7472);
service.new('metallb-controller', {"app": "metallb", "component": "controller"}, metallbPort) +
@ -53,6 +50,4 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
service.mixin.metadata.withLabels({ 'k8s-app': 'metallb-controller' }) +
service.mixin.spec.withClusterIp('None'),
},
};
{ ['metallb-' + name]: kp.metallb[name] for name in std.objectFields(kp.metallb) }
}

View File

@ -1,211 +0,0 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet') +
(import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet') +
(import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') +
(import 'image_sources_versions.jsonnet') +
{
_config+:: {
namespace: "monitoring",
urls+:: {
prom_ingress: 'prometheus.internal.carlosedp.com',
alert_ingress: 'alertmanager.internal.carlosedp.com',
grafana_ingress: 'grafana.internal.carlosedp.com',
grafana_ingress_external: 'grafana.cloud.carlosedp.com',
},
prometheus+:: {
names: 'k8s',
replicas: 1,
namespaces: ["default", "kube-system", "monitoring", "logging", "metallb-system"],
},
alertmanager+:: {
replicas: 1,
},
kubeStateMetrics+:: {
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
scrapeTimeout: '30s',
baseCPU: '100m',
baseMemory: '150Mi',
cpuPerNode: '2m',
memoryPerNode: '30Mi',
},
grafana+:: {
config: {
sections: {
// database: { path: '/data/grafana.db' },
// paths: {
// data: '/var/lib/grafana',
// logs: '/var/lib/grafana/log',
// plugins: '/var/lib/grafana/plugins',
// provisioning: '/etc/grafana/provisioning',
// },
session: { provider: 'memory' },
'auth.basic': {enabled: false},
'auth.anonymous': {enabled: false},
smtp: {
enabled: true,
host: 'smtp-server.monitoring.svc:25',
user: '',
password: '',
from_address:'carlosedp@gmail.com',
from_name: 'Grafana Alert',
skip_verify: true
},
},
},
},
},
//---------------------------------------
// End of _config
//---------------------------------------
prometheus+:: {
local pvc = k.core.v1.persistentVolumeClaim,
prometheus+: {
spec+: {
retention: '15d',
externalUrl: 'http://' + $._config.urls.prom_ingress,
storage: {
volumeClaimTemplate:
pvc.new() +
pvc.mixin.spec.withAccessModes('ReadWriteOnce') +
pvc.mixin.spec.resources.withRequests({ storage: '20Gi' })
# Uncomment below to define a StorageClass name
#+ pvc.mixin.spec.withStorageClassName('nfs-master-ssd'),
},
},
},
},
# Override deployment for Grafana data persistence
grafana+:: {
deployment+: {
spec+: {
template+: {
spec+: {
volumes:
std.map(
function(v)
if v.name == 'grafana-storage' then
{'name':'grafana-storage',
'persistentVolumeClaim': {
'claimName': 'grafana-storage'}
}
else
v,
super.volumes
),
},
},
},
},
storage:
local pvc = k.core.v1.persistentVolumeClaim;
pvc.new() + pvc.mixin.metadata.withNamespace($._config.namespace) +
pvc.mixin.metadata.withName("grafana-storage") +
pvc.mixin.spec.withAccessModes('ReadWriteMany') +
pvc.mixin.spec.resources.withRequests({ storage: '2Gi' }),
},
// Add custom dashboards
grafanaDashboards+:: {
'kubernetes-cluster-dashboard.json': (import 'grafana-dashboards/kubernetes-cluster-dashboard.json'),
'prometheus-dashboard.json': (import 'grafana-dashboards/prometheus-dashboard.json'),
'traefik-dashboard.json': (import 'grafana-dashboards/traefik-dashboard.json'),
'coredns-dashboard.json': (import 'grafana-dashboards/coredns-dashboard.json'),
},
// Create ingress objects per application
ingress+: {
local secret = k.core.v1.secret,
local ingress = k.extensions.v1beta1.ingress,
local ingressTls = ingress.mixin.spec.tlsType,
local ingressRule = ingress.mixin.spec.rulesType,
local httpIngressPath = ingressRule.mixin.http.pathsType,
'alertmanager-main':
ingress.new() +
ingress.mixin.metadata.withName('alertmanager-main') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.alert_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('alertmanager-main') +
httpIngressPath.mixin.backend.withServicePort('web')
),
),
'grafana':
ingress.new() +
ingress.mixin.metadata.withName('grafana') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.grafana_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('grafana') +
httpIngressPath.mixin.backend.withServicePort('http')
),
),
'prometheus-k8s':
ingress.new() +
ingress.mixin.metadata.withName('prometheus-k8s') +
ingress.mixin.metadata.withNamespace($._config.namespace) +
ingress.mixin.spec.withRules(
ingressRule.new() +
ingressRule.withHost($._config.urls.prom_ingress) +
ingressRule.mixin.http.withPaths(
httpIngressPath.new() +
httpIngressPath.withPath('/') +
httpIngressPath.mixin.backend.withServiceName('prometheus-k8s') +
httpIngressPath.mixin.backend.withServicePort('web')
),
),
// // Example external ingress with authentication
// 'grafana-external':
// ingress.new() +
// ingress.mixin.metadata.withName('grafana-external') +
// ingress.mixin.metadata.withNamespace($._config.namespace) +
// ingress.mixin.metadata.withLabels({'traffic-type': 'external'}) +
// ingress.mixin.metadata.withAnnotations({
// 'ingress.kubernetes.io/auth-type': 'basic',
// 'ingress.kubernetes.io/auth-secret': 'basic-auth',
// }) +
// ingress.mixin.spec.withRules(
// ingressRule.new() +
// ingressRule.withHost($._config.urls.grafana_ingress_external) +
// ingressRule.mixin.http.withPaths(
// httpIngressPath.new() +
// httpIngressPath.withPath('/') +
// httpIngressPath.mixin.backend.withServiceName('grafana') +
// httpIngressPath.mixin.backend.withServicePort('http')
// ),
// ),
// 'basic-auth-secret':
// // First generate the auth secret with gen_auth.sh script
// secret.new('basic-auth', { auth: std.base64(importstr 'auth') }) +
// secret.mixin.metadata.withNamespace($._config.namespace),
},
};
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } +
{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } +
{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } +
{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } +
{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } +
{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
{ ['ingress-' + name]: kp.ingress[name] for name in std.objectFields(kp.ingress) } +
{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }

View File

@ -1,7 +1,5 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'image_sources_versions.jsonnet') +
{
_config+:: {
namespace: 'monitoring',
@ -52,6 +50,4 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
service.mixin.metadata.withNamespace($._config.namespace) +
service.mixin.metadata.withLabels({ 'run': 'smtp-server' })
},
};
{ ['smtp-server-' + name]: kp.smtpServer[name] for name in std.objectFields(kp.smtpServer) }
}

View File

@ -1,14 +1,17 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
{
_config+:: {
namespace: 'monitoring',
// Add custom dashboards
grafanaDashboards+:: {
'traefik-dashboard.json': (import 'grafana-dashboards/traefik-dashboard.json'),
},
},
traefik+:: {
serviceMonitor:
{
apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor',
metadata: {
@ -40,6 +43,4 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
},
},
},
};
{ ['traefik-' + name]: kp.traefik[name] for name in std.objectFields(kp.traefik) }
}