Merge pull request #233 from GuGoOrg/dev

Dev
GuGoOrg · Sep 4, 2023 · 9475280 · 9475280
2 parents 52d9fe0 + ffef004
commit 9475280
Show file tree

Hide file tree

Showing 32 changed files with 918 additions and 17 deletions.
diff --git a/config/logs/fluent-bit.conf b/config/logs/fluent-bit.conf
@@ -29,4 +29,4 @@
     Logstash_Format  On
     Retry_Limit      False
     Time_Key         @timestamp
-    Logstash_Prefix  gugotik
+    Logstash_Prefix  gugotik-log
diff --git a/go.mod b/go.mod
@@ -83,6 +83,8 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/denis-tingaikin/go-header v0.4.3 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/elastic/go-elasticsearch v0.0.0
+	github.com/elastic/go-elasticsearch/v7 v7.17.10
 	github.com/esimonov/ifshort v1.0.4 // indirect
 	github.com/ettle/strcase v0.1.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect

diff --git a/go.sum b/go.sum
@@ -75,6 +75,7 @@ github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pO
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
 github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
 github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
@@ -158,6 +159,10 @@ github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20
 github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/elastic/go-elasticsearch v0.0.0 h1:Pd5fqOuBxKxv83b0+xOAJDAkziWYwFinWnBO0y+TZaA=
+github.com/elastic/go-elasticsearch v0.0.0/go.mod h1:TkBSJBuTyFdBnrNqoPc54FN0vKf5c04IdM4zuStJ7xg=
+github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
+github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -206,6 +211,7 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -647,6 +653,7 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
 github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=

diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml
@@ -65,13 +65,13 @@ spec:
               memory: 200Mi
           volumeMounts:
             - mountPath: /fluent-bit/etc
-              name: gugotik-log-config
+              name: config
             - mountPath: /var/log/gugotik
               name: log-volume
       volumes:
         - name: config
           configMap:
-            name: fluentbit-config
+            name: gugotik-log-config
         - name: log-volume
           emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-comment-service.yaml b/manifests-endymx/deployment-comment-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: grpc-37003
                 containerPort: 37003
@@ -50,4 +53,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: metrics-37099
                 containerPort: 37099
@@ -47,4 +50,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-favorite-service.yaml b/manifests-endymx/deployment-favorite-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: grpc-37006
                 containerPort: 37006
@@ -50,4 +53,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: grpc-37004
                 containerPort: 37004
@@ -50,4 +53,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-http-service.yaml b/manifests-endymx/deployment-http-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: http-37000
                 containerPort: 37000
@@ -47,4 +50,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-message-service.yaml b/manifests-endymx/deployment-message-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: grpc-37007
                 containerPort: 37007
@@ -50,4 +53,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-msg-consumer-service.yaml b/manifests-endymx/deployment-msg-consumer-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: metrics-37099
                 containerPort: 37099
@@ -47,4 +50,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml
@@ -25,6 +25,11 @@ spec:
         - name: volume
           persistentVolumeClaim:
             claimName: storage
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       imagePullSecrets:
         -   name: regcred
       containers:
@@ -57,4 +62,21 @@ spec:
             volumeMounts:
               - mountPath: /data/apps/gugotik-service-bundle/data
                 name: volume
+              - mountPath: /var/log/gugotik
+                name: log-volume
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
       terminationGracePeriodSeconds: 30
diff --git a/manifests-endymx/deployment-recommend-service.yaml b/manifests-endymx/deployment-recommend-service.yaml
@@ -36,6 +36,9 @@ spec:
                   name: gugotik-env
               - secretRef:
                   name: gugotik-secret
+            volumeMounts:
+              - mountPath: /var/log/gugotik
+                name: log-volume
             ports:
               - name: grpc-37009
                 containerPort: 37009
@@ -50,4 +53,25 @@ spec:
               requests:
                 cpu: 100m
                 memory: 128Mi
+        - name: logger
+          image: fluent/fluent-bit:1.8.4
+          imagePullPolicy: IfNotPresent
+          resources:
+            requests:
+              cpu: 20m
+              memory: 100Mi
+            limits:
+              cpu: 100m
+              memory: 200Mi
+          volumeMounts:
+            - mountPath: /fluent-bit/etc
+              name: config
+            - mountPath: /var/log/gugotik
+              name: log-volume
+      volumes:
+        - name: config
+          configMap:
+            name: gugotik-log-config
+        - name: log-volume
+          emptyDir: { }
       terminationGracePeriodSeconds: 30