Merge pull request #1212 from kube-logging/banzaicloud-rename

Update banzaicloud references

Author: ahma

Makefile

@@ -7,7 +7,7 @@ export PATH := $(BIN):$(PATH)
 OS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)
 
-DOCKER = docker
+DOCKER ?= docker
 GOVERSION = $(shell go env GOVERSION)
 
 # Image name to use for building/pushing image targets
@@ -16,15 +16,11 @@ IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false,maxDescLen=0"
 
-DRAIN_WATCH_IMAGE_TAG_NAME ?= ghcr.io/banzaicloud/fluentd-drain-watch
+DRAIN_WATCH_IMAGE_TAG_NAME ?= ghcr.io/kube-logging/fluentd-drain-watch
 DRAIN_WATCH_IMAGE_TAG_VERSION ?= latest
 
 VERSION := $(shell git describe --abbrev=0 --tags)
 
-# Where do we use these???
-DOCKER_IMAGE = banzaicloud/logging-operator
-DOCKER_TAG ?= ${VERSION}
-
 E2E_TEST_TIMEOUT ?= 20m
 
 

README.md

@@ -1,19 +1,11 @@
 <p align="center"><img src="docs/img/lo.svg" width="260"></p>
 <p align="center">
 
-  <a href="https://hub.docker.com/r/banzaicloud/logging-operator/">
-    <img src="https://img.shields.io/docker/automated/banzaicloud/logging-operator.svg" alt="Docker Automated build">
-  </a>
-
-  <a href="https://hub.docker.com/r/banzaicloud/logging-operator/">
-    <img src="https://img.shields.io/docker/pulls/banzaicloud/logging-operator.svg?style=shield" alt="Docker Pulls">
-  </a>
-
   <a href="https://goreportcard.com/badge/github.com/kube-logging/logging-operator">
     <img src="https://goreportcard.com/badge/github.com/kube-logging/logging-operator" alt="Go Report Card">
   </a>
 
-  <a href="https://github.com/banzaicloud/logging-operator/">
+  <a href="https://github.com/kube-logging/logging-operator/">
     <img src="https://img.shields.io/badge/license-Apache%20v2-orange.svg" alt="license">
   </a>
 
@@ -100,7 +92,7 @@ If you encounter problems while using the Logging operator the documentation doe
 If you find this project useful, help us:
 
 - Support the development of this project and star this repo! :star:
-- If you use the Logging operator in a production environment, add yourself to the list of production [adopters](https://github.com/banzaicloud/logging-operator/blob/master/ADOPTERS.md).:metal: <br> 
+- If you use the Logging operator in a production environment, add yourself to the list of production [adopters](https://github.com/kube-logging/logging-operator/blob/master/ADOPTERS.md).:metal: <br> 
 - Help new users with issues they may encounter :muscle:
 - Send a pull request with your new features and bug fixes :rocket: 
 

config/dashboards/logging-dashboard.json

@@ -7,7 +7,7 @@
     "list": [
     ]
   },
-  "description": "This is a simple dashboard for: https://github.com/banzaicloud/logging-operator utilising Fluent-bit and Fluentd",
+  "description": "This is a simple dashboard for: https://github.com/kube-logging/logging-operator utilising Fluent-bit and Fluentd",
   "editable": true,
   "gnetId": 7752,
   "graphTooltip": 0,

docs/configuration/crds/v1beta1/fluentbit_types.md

@@ -90,7 +90,7 @@ Default: -
 
 ### positiondb (volume.KubernetesVolume, optional) {#fluentbitspec-positiondb}
 
-[volume.KubernetesVolume](https://github.com/banzaicloud/operator-tools/tree/master/docs/types) 
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
 Default: -
 
@@ -144,7 +144,7 @@ Default: -
 
 ### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentbitspec-bufferstoragevolume}
 
-[volume.KubernetesVolume](https://github.com/banzaicloud/operator-tools/tree/master/docs/types) 
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
 Default: -
 

docs/configuration/crds/v1beta1/fluentd_types.md

@@ -42,7 +42,7 @@ Default: -
 
 ### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentdspec-bufferstoragevolume}
 
-BufferStorageVolume is by default configured as PVC using FluentdPvcSpec [volume.KubernetesVolume](https://github.com/banzaicloud/operator-tools/tree/master/docs/types) 
+BufferStorageVolume is by default configured as PVC using FluentdPvcSpec [volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
 Default: -
 

docs/configuration/crds/v1beta1/node_agent_types.md

@@ -85,7 +85,7 @@ Default: -
 
 ### positiondb (volume.KubernetesVolume, optional) {#nodeagentfluentbit-positiondb}
 
-[volume.KubernetesVolume](https://github.com/banzaicloud/operator-tools/tree/master/docs/types) 
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
 Default: -
 
@@ -123,7 +123,7 @@ Default: -
 
 ### bufferStorageVolume (volume.KubernetesVolume, optional) {#nodeagentfluentbit-bufferstoragevolume}
 
-[volume.KubernetesVolume](https://github.com/banzaicloud/operator-tools/tree/master/docs/types) 
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
 Default: -
 

docs/configuration/plugins/_index.md

@@ -4,7 +4,7 @@ weight: 200
 generated_file: true
 ---
 
-# [Kubernetes Events Timestamp Filter](https://github.com/banzaicloud/fluentd-filter-kube-events-timestamp)
+# [Kubernetes Events Timestamp Filter](https://github.com/kube-logging/fluentd-filter-kube-events-timestamp)
 ## Overview
  Fluentd Filter plugin to select particular timestamp into an additional field
 

docs/configuration/plugins/filters/kube_events_timestamp.md

@@ -6,7 +6,7 @@ generated_file: true
 
 # Fluentd Plugin to re-tag based on log metadata
 ## Overview
-More info at https://github.com/banzaicloud/fluent-plugin-tag-normaliser
+More info at https://github.com/kube-logging/fluent-plugin-tag-normaliser
 
 Available kubernetes metadata
 
@@ -25,7 +25,7 @@ Available kubernetes metadata
 
 ### format (string, optional) {#tag normaliser parameters-format}
 
-Re-Tag log messages info at [github](https://github.com/banzaicloud/fluent-plugin-tag-normaliser) 
+Re-Tag log messages info at [github](https://github.com/kube-logging/fluent-plugin-tag-normaliser) 
 
 Default: ${namespace_name}.${pod_name}.${container_name}
 

docs/configuration/plugins/filters/tagnormaliser.md

@@ -6,7 +6,7 @@ generated_file: true
 
 # [LogDNA Output](https://github.com/logdna/fluent-plugin-logdna)
 ## Overview
- This plugin has been designed to output logs to LogDNA. Example Deployment: [Transport Nginx Access Logs into LogDNA with Logging Operator](https://raw.githubusercontent.com/banzaicloud/logging-operator/master/docs/examples/logging_output_logdna.yaml)
+ This plugin has been designed to output logs to LogDNA.
 
 ## Configuration
 ## LogDNA

docs/configuration/plugins/outputs/logdna.md

@@ -7,7 +7,7 @@ generated_file: true
 # Loki output plugin 
 ## Overview
 Fluentd output plugin to ship logs to a Loki server.
-More info at https://github.com/banzaicloud/fluent-plugin-kubernetes-loki
+More info at https://github.com/kube-logging/fluent-plugin-kubernetes-loki
 >Example: [Store Nginx Access Logs in Grafana Loki with Logging Operator](../../../../quickstarts/loki-nginx/)
 
  #### Example output configurations

docs/configuration/plugins/outputs/loki.md

@@ -32,9 +32,9 @@ Create a *fluentd.conf*.
 </match>
 ```
 
-Start locasl fluentd
+Start local fluentd
 ```bash
-docker run -p 8888:8888 -v $PWD/fluentd.conf:/fluent/fluent.conf --rm banzaicloud/fluentd:v1.11.2-alpine-2 -c /fluent/fluent.conf
+docker run -p 8888:8888 -v $PWD/fluentd.conf:/fluent/fluent.conf --rm ghcr.io/kube-logging/fluentd:v1.11 -c /fluent/fluent.conf
 ```
 
 Setup kurun service for port-forward

docs/sniffing-trafic.md

@@ -514,7 +514,7 @@ For more details, see [the official docs](https://www.syslog-ng.com/technical-do
 
 Example kubernetes message:
 ```json
-{"user":"-","ts":"2022-08-02T07:41:34.090763Z","time":"02/Aug/2022:07:41:34 +0000","stream":"stdout","source":"/var/log/log-generator","size":"1628","remote":"85.151.230.190","referer":"-","path":"/index.html","method":"POST","logtag":"F","kubernetes":{"pod_name":"one-eye-log-generator-57988cbd65-gpgc4","pod_id":"010d4598-2e34-4165-accd-2b77e4fc4bb6","namespace_name":"default","labels":{"pod-template-hash":"57988cbd65","app.kubernetes.io/name":"log-generator","app.kubernetes.io/instance":"one-eye-log-generator"},"host":"ip-192-168-6-51.eu-west-1.compute.internal","docker_id":"89e7cf414b5e6ff1fbee977d62cbc96794d2debd6a52803857d5dbad57d4f772","container_name":"log-generator","container_image":"033498657557.dkr.ecr.us-east-2.amazonaws.com/banzaicloud/log-generator:0.3.20","container_hash":"033498657557.dkr.ecr.us-east-2.amazonaws.com/banzaicloud/log-generator@sha256:b031138718194a17fdac2964bacf9543f96b037a65cd50138a5754ddb7897bb5"},"http_x_forwarded_for":"\"-\"","host":"-","code":"403","cluster":"xxxxx","agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"}
+{"user":"-","ts":"2022-08-02T07:41:34.090763Z","time":"02/Aug/2022:07:41:34 +0000","stream":"stdout","source":"/var/log/log-generator","size":"1628","remote":"85.151.230.190","referer":"-","path":"/index.html","method":"POST","logtag":"F","kubernetes":{"pod_name":"one-eye-log-generator-57988cbd65-gpgc4","pod_id":"010d4598-2e34-4165-accd-2b77e4fc4bb6","namespace_name":"default","labels":{"pod-template-hash":"57988cbd65","app.kubernetes.io/name":"log-generator","app.kubernetes.io/instance":"one-eye-log-generator"},"host":"ip-192-168-6-51.eu-west-1.compute.internal","docker_id":"89e7cf414b5e6ff1fbee977d62cbc96794d2debd6a52803857d5dbad57d4f772","container_name":"log-generator","container_image":"ghcr.io/kube-logging/log-generator:0.3.20","container_hash":"ghcr.io/kube-logging/log-generator@sha256:b031138718194a17fdac2964bacf9543f96b037a65cd50138a5754ddb7897bb5"},"http_x_forwarded_for":"\"-\"","host":"-","code":"403","cluster":"xxxxx","agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"}
 ```
 
 ## Complex example

docs/syslogng-quickstart.md

@@ -40,7 +40,7 @@ kind create cluster --name drainer
 
 Build and upload fresh drain-watch sidecar image
 ```sh
-docker build drain-watch-image -t ghcr.io/banzaicloud/fluentd-drain-watch:testing && kind load docker-image --name drainer ghcr.io/banzaicloud/fluentd-drain-watch:testing
+docker build drain-watch-image -t ghcr.io/kube-logging/fluentd-drain-watch:testing && kind load docker-image --name drainer ghcr.io/kube-logging/fluentd-drain-watch:testing
 ```
 
 Install log-generator

docs/volume-drainer.md

@@ -38,7 +38,7 @@ RUN apk update \
  && gem install elasticsearch -v 7.13.3 \
  && gem install elasticsearch-xpack -v 7.13.3 \
  && gem install fluent-plugin-detect-exceptions -v 0.0.14 \
- # FMI https://github.com/banzaicloud/logging-operator/issues/887 \
+ # FMI https://github.com/kube-logging/logging-operator/issues/887 \
  && find /usr/lib/ruby/gems/2.*/gems/fluent-plugin-detect-exceptions-* -type f -print0 | xargs -0 chmod 644 \
  && gem install \
          specific_install \
@@ -77,7 +77,7 @@ RUN apk update \
          fluent-plugin-grok-parser \
  && gem specific_install -l https://github.com/tarokkk/fluent-plugin-logzio.git \
  && gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git \
- && gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git \
+ && gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git \
  && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git -d fluent-plugin-kubernetes-metadata-filter \
  && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git -d fluent-plugin-enhance-k8s-metadata \
  && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git -d fluent-plugin-kubernetes-sumologic \

fluentd-image/e2e-test/Dockerfile

@@ -53,11 +53,11 @@ const (
 	defaultBufferVolumeMetricsPort    = 9200
 	syslogngImageRepository           = "balabit/syslog-ng"
 	syslogngImageTag                  = "4.0.1"
-	prometheusExporterImageRepository = "ghcr.io/banzaicloud/syslog-ng-exporter"
-	prometheusExporterImageTag        = "0.0.13"
-	bufferVolumeImageRepository       = "ghcr.io/banzaicloud/custom-runner"
-	bufferVolumeImageTag              = "0.1.3"
-	configReloaderImageRepository     = "ghcr.io/banzaicloud/syslogng-reload"
+	prometheusExporterImageRepository = "ghcr.io/kube-logging/syslog-ng-exporter"
+	prometheusExporterImageTag        = "v0.0.14"
+	bufferVolumeImageRepository       = "ghcr.io/kube-logging/custom-runner"
+	bufferVolumeImageTag              = "v0.4.0"
+	configReloaderImageRepository     = "ghcr.io/kube-logging/syslogng-reload"
 	configReloaderImageTag            = "v1.0.1"
 	socketVolumeName                  = "socket"
 	socketPath                        = "/tmp/syslog-ng/syslog-ng.ctl"

pkg/resources/syslogng/syslogng.go

@@ -67,7 +67,7 @@ func (t TailerWebhookConfig) VersionedFluentBitPathArgs(filePath string) []strin
 var Global = GlobalConfig{
 	FluentBitPosFilePath:   "/var/pos",
 	FluentBitPosVolumeName: "positions",
-	OperatorImage:          "033498657557.dkr.ecr.us-east-2.amazonaws.com/banzaicloud/logging-extensions:0.2.0",
+	OperatorImage:          "ghcr.io/banzaicloud/logging-operator:4.0.0-rc19",
 }
 
 // HostTailer configuration

pkg/sdk/extensions/extensionsconfig/config.go

@@ -121,22 +121,22 @@ type DefaultFlowSpec struct {
 const (
 	DefaultFluentbitImageRepository             = "fluent/fluent-bit"
 	DefaultFluentbitImageTag                    = "1.9.5"
-	DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/banzaicloud/node-exporter"
+	DefaultFluentbitBufferVolumeImageRepository = "ghcr.io/kube-logging/node-exporter"
 	DefaultFluentbitBufferVolumeImageTag        = "v0.2.0"
 	DefaultFluentbitBufferStorageVolumeName     = "fluentbit-buffer"
-	DefaultFluentdImageRepository               = "ghcr.io/banzaicloud/fluentd"
-	DefaultFluentdImageTag                      = "v1.14.6-alpine-5"
+	DefaultFluentdImageRepository               = "ghcr.io/kube-logging/fluentd"
+	DefaultFluentdImageTag                      = "v1.14"
 	DefaultFluentdBufferStorageVolumeName       = "fluentd-buffer"
-	DefaultFluentdDrainWatchImageRepository     = "ghcr.io/banzaicloud/fluentd-drain-watch"
-	DefaultFluentdDrainWatchImageTag            = "v0.0.5"
+	DefaultFluentdDrainWatchImageRepository     = "ghcr.io/kube-logging/fluentd-drain-watch"
+	DefaultFluentdDrainWatchImageTag            = "v0.2.0"
 	DefaultFluentdDrainPauseImageRepository     = "k8s.gcr.io/pause"
 	DefaultFluentdDrainPauseImageTag            = "3.2"
 	DefaultFluentdVolumeModeImageRepository     = "busybox"
 	DefaultFluentdVolumeModeImageTag            = "latest"
-	DefaultFluentdConfigReloaderImageRepository = "ghcr.io/banzaicloud/config-reloader"
-	DefaultFluentdConfigReloaderImageTag        = "0.0.1"
-	DefaultFluentdBufferVolumeImageRepository   = "ghcr.io/banzaicloud/custom-runner"
-	DefaultFluentdBufferVolumeImageTag          = "0.1.0"
+	DefaultFluentdConfigReloaderImageRepository = "ghcr.io/kube-logging/config-reloader"
+	DefaultFluentdConfigReloaderImageTag        = "v0.0.2"
+	DefaultFluentdBufferVolumeImageRepository   = "ghcr.io/kube-logging/custom-runner"
+	DefaultFluentdBufferVolumeImageTag          = "v0.4.0"
 )
 
 // SetDefaults fills empty attributes

pkg/sdk/logging/api/v1beta1/logging_types.go

@@ -24,12 +24,12 @@ import (
 type _hugoKubeEventsTimestamp interface{} //nolint:deadcode,unused
 
 // +kubebuilder:object:generate=true
-// +docName:"[Kubernetes Events Timestamp Filter](https://github.com/banzaicloud/fluentd-filter-kube-events-timestamp)"
+// +docName:"[Kubernetes Events Timestamp Filter](https://github.com/kube-logging/fluentd-filter-kube-events-timestamp)"
 // Fluentd Filter plugin to select particular timestamp into an additional field
 type _docKubeEventsTimestamp interface{} //nolint:deadcode,unused
 
 // +name:"Kubernetes Events Timestamp"
-// +url:"https://github.com/banzaicloud/fluentd-filter-kube-events-timestamp"
+// +url:"https://github.com/kube-logging/fluentd-filter-kube-events-timestamp"
 // +version:"0.1.4"
 // +description:"Fluentd Filter plugin to select particular timestamp into an additional field"
 // +status:"GA"

pkg/sdk/logging/model/filter/kube_events_timestamp.go

@@ -24,7 +24,7 @@ import (
 type _hugoTagNormaliser interface{} //nolint:deadcode,unused
 
 // +docName:"Fluentd Plugin to re-tag based on log metadata"
-// More info at https://github.com/banzaicloud/fluent-plugin-tag-normaliser
+// More info at https://github.com/kube-logging/fluent-plugin-tag-normaliser
 //
 // # Available kubernetes metadata
 //
@@ -40,15 +40,15 @@ type _hugoTagNormaliser interface{} //nolint:deadcode,unused
 type _docTagNormaliser interface{} //nolint:deadcode,unused
 
 // +name:"Tag Normaliser"
-// +url:"https://github.com/banzaicloud/fluent-plugin-tag-normaliser"
+// +url:"https://github.com/kube-logging/fluent-plugin-tag-normaliser"
 // +version:"0.1.1"
 // +description:"Re-tag based on log metadata"
 // +status:"GA"
 type _metaTagNormaliser interface{} //nolint:deadcode,unused
 
 // +docName:"Tag Normaliser parameters"
 type TagNormaliser struct {
-	// Re-Tag log messages info at [github](https://github.com/banzaicloud/fluent-plugin-tag-normaliser)
+	// Re-Tag log messages info at [github](https://github.com/kube-logging/fluent-plugin-tag-normaliser)
 	Format string `json:"format,omitempty" plugin:"default:${namespace_name}.${pod_name}.${container_name}"`
 	// Tag used in match directive. (default: kubernetes.**)
 	MatchTag string `json:"match_tag,omitempty" plugin:"hidden"`

pkg/sdk/logging/model/filter/tagnormaliser.go

@@ -24,7 +24,7 @@ import (
 type _hugoGCS interface{} //nolint:deadcode,unused
 
 // +docName:"Google Cloud Storage"
-// Store logs in Google Cloud Storage. For details, see [https://github.com/banzaicloud/fluent-plugin-gcs](https://github.com/banzaicloud/fluent-plugin-gcs).
+// Store logs in Google Cloud Storage. For details, see [https://github.com/kube-logging/fluent-plugin-gcs](https://github.com/kube-logging/fluent-plugin-gcs).
 //
 // ## Example
 // ```yaml
@@ -39,7 +39,7 @@ type _hugoGCS interface{} //nolint:deadcode,unused
 type _docGCS interface{} //nolint:deadcode,unused
 
 // +name:"Google Cloud Storage"
-// +url:"https://github.com/banzaicloud/fluent-plugin-gcs"
+// +url:"https://github.com/kube-logging/fluent-plugin-gcs"
 // +version:"0.4.0"
 // +description:"Store logs in Google Cloud Storage"
 // +status:"GA"

pkg/sdk/logging/model/output/gcs.go

@@ -25,7 +25,7 @@ type _hugoLogDNA interface{} //nolint:deadcode,unused
 
 // +kubebuilder:object:generate=true
 // +docName:"[LogDNA Output](https://github.com/logdna/fluent-plugin-logdna)"
-// This plugin has been designed to output logs to LogDNA. Example Deployment: [Transport Nginx Access Logs into LogDNA with Logging Operator](https://raw.githubusercontent.com/banzaicloud/logging-operator/master/docs/examples/logging_output_logdna.yaml)
+// This plugin has been designed to output logs to LogDNA.
 type _docLogDNA interface{} //nolint:deadcode,unused
 
 // +name:"LogDNA"

pkg/sdk/logging/model/output/logdna.go

@@ -26,7 +26,7 @@ type _hugoLoki interface{} //nolint:deadcode,unused
 
 // +docName:"Loki output plugin "
 // Fluentd output plugin to ship logs to a Loki server.
-// More info at https://github.com/banzaicloud/fluent-plugin-kubernetes-loki
+// More info at https://grafana.com/docs/loki/latest/clients/fluentd/
 // >Example: [Store Nginx Access Logs in Grafana Loki with Logging Operator](../../../../quickstarts/loki-nginx/)
 //
 // ## Example output configurations

pkg/sdk/logging/model/output/loki.go

@@ -23,7 +23,7 @@ import (
 	"github.com/kube-logging/logging-operator/pkg/sdk/logging/maps/mapstrstr"
 )
 
-// OutputPlugin plugin: https://github.com/banzaicloud/fluent-plugin-label-router
+// OutputPlugin plugin: https://github.com/kube-logging/fluent-plugin-label-router
 type Router struct {
 	PluginMeta
 	Routes []Directive `json:"routes"`