New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change namespace #267

Merged

benjaminhuo merged 1 commit into fluent:master from wenchajun:namespace

Apr 23, 2022

Member

wenchajun commented Apr 21, 2022

Signed-off-by: chengdehao dehaocheng@kubesphere.io

What this PR does / why we need it:

Since the name change to fluent-operator, we should also change the namespace to fluent. For this reason, I changed the relevant parameters in e2e test, readme and manifest to switch the namespace to fluent.

Which issue(s) this PR fixes:

Fixes #

Does this PR introduced a user-facing change?

Additional documentation, usage docs, etc.:

benjaminhuo requested review from zhu733756 and wanjunlei

April 21, 2022 10:10

zhu733756 reviewed

View reviewed changes

manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml Outdated

@@ @@ -63,7 +63,7 @@ spec: @@
                     type: file
                     path: /buffers/stdout.log
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

zhu733756 Apr 22, 2022

I think this part no need to change? It will use in the ks-installer？

Member

zhu733756 Apr 22, 2022 •

edited

Loading

I think this part no need to change? It will use in the ks-installer？

Or just leave it empty like "[elastic-cluster-host]"

Member Author

wenchajun Apr 22, 2022

The configuration of ks-installer has nothing to do with the configuration of this repository. I think the files in the manifest folder should be enabled as soon as they are deployed like the original.

Member

zhu733756 Apr 22, 2022

Keep it same to https://github.com/fluent/fluent-operator/blob/master/charts/fluent-operator/values.yaml#L98

Member Author

wenchajun Apr 22, 2022

Keep it same to https://github.com/fluent/fluent-operator/blob/master/charts/fluent-operator/values.yaml#L98

thanks,fixed.

zhu733756 approved these changes

View reviewed changes

wenchajun force-pushed the namespace branch from 372d020 to 6d84d4a Compare

April 22, 2022 02:58

benjaminhuo requested changes

View reviewed changes

README.md Outdated

@@ @@ -396,7 +396,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc
only need to the fluentd or fluentbit or fluent operator namespace to fluent

README.md Outdated

                 labels:
                   output.fluentd.fluent.io/enabled: "true"
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

Same here: we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

README.md Outdated

@@ @@ -516,7 +516,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

README.md Outdated

                 labels:
                   output.fluentd.fluent.io/enabled: "true"
                   output.fluentd.fluent.io/user: "user1"
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

README.md Outdated

@@ @@ -607,7 +607,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml Outdated

@@ @@ -78,7 +78,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml Outdated

@@ @@ -94,7 +94,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml Outdated

@@ @@ -54,7 +54,7 @@ metadata: @@
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml Outdated

                 labels:
                   output.fluentd.fluent.io/enabled: "true"
               spec:
                 outputs:
                 - elasticsearch:
-                    host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                    host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

manifests/logging-stack/auditd/output-auditd-elasticsearch.yaml Outdated

@@ @@ -8,7 +8,7 @@ metadata: @@
               spec:
                 matchRegex: auditd
                 es:
-                  host: elasticsearch-logging-data.kubesphere-logging-system.svc
+                  host: elasticsearch-logging-data.fluent.svc

Member

benjaminhuo Apr 22, 2022

we can keep the es namespace as it is before : elasticsearch-logging-data.kubesphere-logging-system.svc

wenchajun force-pushed the namespace branch 2 times, most recently from 15ac733 to 49d5614 Compare

April 22, 2022 09:44


          change namespace

03d44d5

Signed-off-by: chengdehao <dehaocheng@kubesphere.io>

wenchajun force-pushed the namespace branch from 49d5614 to 03d44d5 Compare

April 22, 2022 10:31

benjaminhuo approved these changes

View reviewed changes

benjaminhuo merged commit 09563bb into fluent:master

wenchajun deleted the namespace branch

April 6, 2023 08:53

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment