Skip to content

Commit

Permalink
Replace ElasticSearch with Loki
Browse files Browse the repository at this point in the history
  • Loading branch information
vlvasilev committed Jul 28, 2020
1 parent 57aeca0 commit a149f41
Show file tree
Hide file tree
Showing 124 changed files with 1,679 additions and 5,012 deletions.
8 changes: 2 additions & 6 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,8 @@ The following charts of the [`charts`](charts) directory were seeded based on a
* [git.k8s.io/charts/stable/nginx-ingress](https://git.k8s.io/charts/stable/nginx-ingress)
* [git.k8s.io/charts/stable/prometheus](https://git.k8s.io/charts/stable/prometheus)
* [git.k8s.io/charts/stable/kubernetes-dashboard](https://git.k8s.io/charts/stable/kubernetes-dashboard)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/es-service.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/es-service.yaml)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml)
* [github.com/kubernetes/kubernetes/cluster/addons/fluentd-elasticsearch/kibana-service.yaml](https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/kibana-service.yaml)
* [github.com/grafana/loki/blob/master/production/helm/loki/templates/statefulset.yaml](https://github.com/grafana/loki/blob/master/production/helm/loki/templates/statefulset.yaml)
* [github.com/grafana/loki/blob/master/production/helm/loki/templates/service.yaml](https://github.com/grafana/loki/blob/master/production/helm/loki/templates/service.yaml)

## Container Images

Expand Down
36 changes: 6 additions & 30 deletions charts/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,38 +180,14 @@ images:
tag: "3.10.3"

# Logging
- name: fluentd-es
sourceRepository: github.com/gardener/logging
repository: eu.gcr.io/gardener-project/gardener/fluentd-es
tag: "v0.20.0"
- name: fluent-bit
sourceRepository: github.com/fluent/fluent-bit
repository: fluent/fluent-bit
tag: "1.0.6"
- name: elasticsearch-oss
sourceRepository: github.com/elastic/elasticsearch-docker
repository: docker.elastic.co/elasticsearch/elasticsearch-oss
tag: "6.7.1"
- name: elasticsearch-metrics-exporter
sourceRepository: github.com/justwatchcom/elasticsearch_exporter
repository: justwatch/elasticsearch_exporter
tag: "1.0.2"
- name: elasticsearch-searchguard-oss
sourceRepository: github.com/floragunncom/search-guard
repository: floragunncom/sg-elasticsearch
tag: "6.7.1-oss-25.0"
- name: curator-es
sourceRepository: github.com/gardener/logging
repository: eu.gcr.io/gardener-project/gardener/curator-es
tag: "v0.20.0"
- name: kibana-oss
sourceRepository: github.com/elastic/kibana-docker
repository: docker.elastic.co/kibana/kibana-oss
tag: "6.7.1"
- name: sg-sgadmin
sourceRepository: github.com/floragunncom/search-guard
repository: floragunncom/sg-sgadmin
tag: "6.7.1-25.0"
repository: eu.gcr.io/gardener-project/gardener/fluent-bit-to-loki
tag: "v0.22.0"
- name: loki
sourceRepository: github.com/grafana/loki
repository: grafana/loki
tag: "1.5.0"

# VPA
- name: vpa-admission-controller
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
rule_files:
- ../aggregate-prometheus-rules/loki.rules.yaml

evaluation_interval: 30s

tests:
- interval: 30s
input_series:
# LokiDown
- series: 'up{app="loki"}'
values: '0+0x30'
alert_rule_test:
- eval_time: 15m
alertname: LokiDown
exp_alerts:
- exp_labels:
service: loki
severity: warning
type: seed
visibility: operator
exp_annotations:
description: There are no running loki pods. No logs will be collected.
summary: Loki is down

This file was deleted.

This file was deleted.

14 changes: 14 additions & 0 deletions charts/seed-bootstrap/aggregate-prometheus-rules/loki.rules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
groups:
- name: loki.rules
rules:
- alert: LokiDown
expr: absent(up{app="loki"} == 1)
for: 15m
labels:
service: loki
severity: warning
type: seed
visibility: operator
annotations:
description: There are no running loki pods. No logs will be collected.
summary: Loki is down

This file was deleted.

This file was deleted.

Loading

0 comments on commit a149f41

Please sign in to comment.