[release-1.1] cherrypick beat-exporter (#66)

* �feat(metrics): export Filebeat metrics with beat-exporter (#35)

* added beat-exporter

* revert imagePullPolicy

* disable test & lint

* add filebeat-keeper Dockerfile

* replace base image

Makefile

@@ -29,7 +29,7 @@ TARGETS ?= log-pilot filebeat-keeper
 LOG_PILOT_IMAGE := $(REGISTRIES)/log-pilot:$(VERSION)
 FILEBEAT_IMAGE := $(REGISTRIES)/filebeat:$(VERSION)
 
-.PHONY: default container push
+.PHONY: default container push test lint
 
 default: push
 
@@ -59,3 +59,9 @@ container: build-linux
 push: container
 	docker push $(LOG_PILOT_IMAGE)
 	docker push $(FILEBEAT_IMAGE)
+
+test:
+	@echo "test is not used on this branch"
+
+lint:
+	@echo "lint is not used on this branch"

build/filebeat-keeper/Dockerfile

@@ -0,0 +1 @@
+FROM cargo.caicloud.xyz/library/filebeat:6.5.4

build/filebeat/Dockerfile

@@ -1,4 +1,4 @@
-FROM cargo.caicloudprivatetest.com/library/filebeat:6.5.4
+FROM cargo.caicloud.xyz/library/filebeat:6.5.4
 
 USER root
 RUN yum install -y gettext && yum clean all

build/log-pilot/Dockerfile

@@ -1,13 +1,4 @@
-FROM cargo.caicloudprivatetest.com/library/alpine:3.8
-
-# Use aliyun source
-RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories
-RUN echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories
-
-RUN apk update && \ 
-    apk add wget && \
-    apk add bash && \
-    rm -rf /var/cache/apk/*
+FROM cargo.caicloud.xyz/library/debian:stretch-curl
 
 COPY bin/log-pilot /opt/log-pilot/bin/log-pilot
 COPY assets/filebeat/filebeat.tpl /opt/log-pilot

release/logging-filebeat.yaml

@@ -81,6 +81,21 @@ _config:
         path: /var/run/docker.sock
         readonly: true
         propagation: HostToContainer
+    - image: '[[ registry_release ]]/beat-exporter:v0.1.2'
+      imagePullPolicy: Always
+      resources:
+        limits:
+          cpu: 100m
+          memory: 200Mi
+        requests:
+          cpu: 10m
+          memory: 20Mi
+    pod:
+      annotations:
+      - key: prometheus.io/port
+        value: '9479'
+      - key: prometheus.io/scrape
+        value: 'true'
     type: DaemonSet
     volumes:
     - name: varlog