From 3059b85e87fddce87b3a313a377cef60dc2afbc8 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Wed, 3 Apr 2019 09:20:38 +0100 Subject: [PATCH] Remove unused files Prometheus/Alertmanager are configured in the faas-netes repo for use in Kubernetes. These files are not required. Signed-off-by: Alex Ellis --- prometheus/Dockerfile.alertmanager.k8s | 3 -- prometheus/Dockerfile.prometheus.k8s | 5 -- prometheus/k8s.alert.rules | 15 ------ prometheus/k8s.alertmanager.yml | 69 -------------------------- prometheus/k8s.prometheus.yml | 37 -------------- 5 files changed, 129 deletions(-) delete mode 100644 prometheus/Dockerfile.alertmanager.k8s delete mode 100644 prometheus/Dockerfile.prometheus.k8s delete mode 100644 prometheus/k8s.alert.rules delete mode 100644 prometheus/k8s.alertmanager.yml delete mode 100644 prometheus/k8s.prometheus.yml diff --git a/prometheus/Dockerfile.alertmanager.k8s b/prometheus/Dockerfile.alertmanager.k8s deleted file mode 100644 index 5a2574e8..00000000 --- a/prometheus/Dockerfile.alertmanager.k8s +++ /dev/null @@ -1,3 +0,0 @@ -FROM prom/alertmanager:v0.7.1 - -COPY k8s.alertmanager.yml /alertmanager.yml diff --git a/prometheus/Dockerfile.prometheus.k8s b/prometheus/Dockerfile.prometheus.k8s deleted file mode 100644 index bd86340a..00000000 --- a/prometheus/Dockerfile.prometheus.k8s +++ /dev/null @@ -1,5 +0,0 @@ -FROM prom/prometheus:v1.5.2 - -COPY k8s.prometheus.yml /etc/prometheus/prometheus.yml -COPY k8s.alert.rules /etc/prometheus/alert.rules - diff --git a/prometheus/k8s.alert.rules b/prometheus/k8s.alert.rules deleted file mode 100644 index e2b95d95..00000000 --- a/prometheus/k8s.alert.rules +++ /dev/null @@ -1,15 +0,0 @@ -ALERT service_down - IF up == 0 - -ALERT APIHighInvocationRate - IF sum ( rate(gateway_function_invocation_total{code="200"}[10s]) ) by (function_name) > 5 - FOR 5s - LABELS { - service = "gateway", - severity = "major", - } - ANNOTATIONS { - summary = "High invocation total on {{ $labels.function_name }}", - description = "High invocation total on {{ $labels.function_name }}" - } - diff --git a/prometheus/k8s.alertmanager.yml b/prometheus/k8s.alertmanager.yml deleted file mode 100644 index d68a0fd5..00000000 --- a/prometheus/k8s.alertmanager.yml +++ /dev/null @@ -1,69 +0,0 @@ -global: - # The smarthost and SMTP sender used for mail notifications. - smtp_smarthost: 'localhost:25' - smtp_from: 'alertmanager@example.org' - smtp_auth_username: 'alertmanager' - smtp_auth_password: 'password' - # The auth token for Hipchat. - hipchat_auth_token: '1234556789' - # Alternative host for Hipchat. - hipchat_url: 'https://hipchat.foobar.org/' - -# The directory from which notification templates are read. -templates: -- '/etc/alertmanager/template/*.tmpl' - -# The root route on which each incoming alert enters. -route: - # The labels by which incoming alerts are grouped together. For example, - # multiple alerts coming in for cluster=A and alertname=LatencyHigh would - # be batched into a single group. - group_by: ['alertname', 'cluster', 'service'] - - # When a new group of alerts is created by an incoming alert, wait at - # least 'group_wait' to send the initial notification. - # This way ensures that you get multiple alerts for the same group that start - # firing shortly after another are batched together on the first - # notification. - group_wait: 5s - - # When the first notification was sent, wait 'group_interval' to send a batch - # of new alerts that started firing for that group. - group_interval: 10s - - # If an alert has successfully been sent, wait 'repeat_interval' to - # resend them. - repeat_interval: 30s - - # A default receiver - receiver: scale-up - - # All the above attributes are inherited by all child routes and can - # overwritten on each. - - # The child route trees. - routes: - - match: - service: gateway - receiver: scale-up - severity: major - - -# Inhibition rules allow to mute a set of alerts given that another alert is -# firing. -# We use this to mute any warning-level notifications if the same alert is -# already critical. -inhibit_rules: -- source_match: - severity: 'critical' - target_match: - severity: 'warning' - # Apply inhibition if the alertname is the same. - equal: ['alertname', 'cluster', 'service'] - -receivers: -- name: 'scale-up' - webhook_configs: - - url: http://gateway.default:8080/system/alert - send_resolved: true - diff --git a/prometheus/k8s.prometheus.yml b/prometheus/k8s.prometheus.yml deleted file mode 100644 index 9d8c32b5..00000000 --- a/prometheus/k8s.prometheus.yml +++ /dev/null @@ -1,37 +0,0 @@ -# my global config -global: - scrape_interval: 15s # By default, scrape targets every 15 seconds. - evaluation_interval: 15s # By default, scrape targets every 15 seconds. - # scrape_timeout is set to the global default (10s). - - # Attach these labels to any time series or alerts when communicating with - # external systems (federation, remote storage, Alertmanager). - external_labels: - monitor: 'faas-monitor' - -# Load rules once and periodically evaluate them according to the global 'evaluation_interval'. -rule_files: - - 'alert.rules' - - -# A scrape configuration containing exactly one endpoint to scrape: -# Here it's Prometheus itself. -scrape_configs: - # The job name is added as a label `job=` to any timeseries scraped from this config. - - job_name: 'prometheus' - - # Override the global default and scrape targets from this job every 5 seconds. - scrape_interval: 5s - - # metrics_path defaults to '/metrics' - # scheme defaults to 'http'. - static_configs: - - targets: ['localhost:9090'] - - - job_name: "gateway" - scrape_interval: 5s - dns_sd_configs: - - names: ['gateway.default.svc.cluster.local'] - port: 8082 - type: A - refresh_interval: 5s