Skip to content

Commit

Permalink
⚠️ Remove Filebeat Implementation (#32)
Browse files Browse the repository at this point in the history
We decided to remove the Filebeat implementation to concentrate on the
Fluent Bit implementation in the future.
  • Loading branch information
ricoberger authored Oct 10, 2022
1 parent 282d69d commit 7714b60
Show file tree
Hide file tree
Showing 19 changed files with 88 additions and 1,864 deletions.
62 changes: 12 additions & 50 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -26,21 +26,22 @@ jobs:
DOCKER_TAG="main"
fi
echo ::set-output name=tag::${DOCKER_TAG}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and Push Docker Image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: true
context: .
Expand All @@ -53,7 +54,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -66,64 +67,25 @@ jobs:
DOCKER_TAG="main"
fi
echo ::set-output name=tag::${DOCKER_TAG}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and Push Docker Image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: true
context: .
file: ./cmd/ingester/Dockerfile
platforms: linux/amd64,linux/arm,linux/arm64
tags: kobsio/klogs:${{ steps.tag.outputs.tag }}-ingester

filebeat:
name: Filebeat
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set Docker Tag
id: tag
run: |
if [[ $GITHUB_REF == refs/tags/* ]]; then
DOCKER_TAG="${GITHUB_REF:10}"
else
DOCKER_TAG="main"
fi
echo ::set-output name=tag::${DOCKER_TAG}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and Push Docker Image
id: docker_build
uses: docker/build-push-action@v2
with:
push: true
context: .
file: ./cmd/filebeat/Dockerfile
platforms: linux/amd64,linux/arm64
tags: kobsio/klogs:${{ steps.tag.outputs.tag }}-filebeat
12 changes: 4 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.19

- name: Cache Go
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
Expand All @@ -43,7 +43,3 @@ jobs:
- name: Build Ingester
run: |
make build-ingester
- name: Build Filebeat
run: |
make build-filebeat
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/out_clickhouse.h
/out_clickhouse.so
/ingester
/filebeat
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,3 @@ build-ingester:
-X ${REPO}/pkg/version.BuildUser=${BUILDUSER} \
-X ${REPO}/pkg/version.BuildDate=${BUILDTIME}" \
-o ingester ./cmd/ingester;

.PHONY: build-filebeat
build-filebeat:
@go build -ldflags "-X ${REPO}/pkg/version.Version=${VERSION} \
-X ${REPO}/pkg/version.Revision=${REVISION} \
-X ${REPO}/pkg/version.Branch=${BRANCH} \
-X ${REPO}/pkg/version.BuildUser=${BUILDUSER} \
-X ${REPO}/pkg/version.BuildDate=${BUILDTIME}" \
-o filebeat ./cmd/filebeat;
17 changes: 0 additions & 17 deletions cluster/filebeat/filebeat-clusterrole.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions cluster/filebeat/filebeat-clusterrolebinding.yaml

This file was deleted.

58 changes: 0 additions & 58 deletions cluster/filebeat/filebeat-cm.yaml

This file was deleted.

93 changes: 0 additions & 93 deletions cluster/filebeat/filebeat-ds.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions cluster/filebeat/filebeat-ns.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions cluster/filebeat/filebeat-sa.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions cluster/filebeat/filebeat-svc.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions cmd/filebeat/Dockerfile

This file was deleted.

Loading

0 comments on commit 7714b60

Please sign in to comment.