Skip to content

Commit 9475280

Browse files
liaosunny123liaosunny123
authored
Merge pull request #233 from GuGoOrg/dev
Dev
2 parents 52d9fe0 + ffef004 commit 9475280

32 files changed

Lines changed: 918 additions & 17 deletions

‎config/logs/fluent-bit.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
Logstash_Format On
3030
Retry_Limit False
3131
Time_Key @timestamp
32-
Logstash_Prefix gugotik
32+
Logstash_Prefix gugotik-log

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ require (
8383
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8484
github.com/denis-tingaikin/go-header v0.4.3 // indirect
8585
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
86+
github.com/elastic/go-elasticsearch v0.0.0
87+
github.com/elastic/go-elasticsearch/v7 v7.17.10
8688
github.com/esimonov/ifshort v1.0.4 // indirect
8789
github.com/ettle/strcase v0.1.1 // indirect
8890
github.com/fatih/color v1.15.0 // indirect

‎go.sum‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pO
7575
github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
7676
github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
7777
github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
78+
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
7879
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
7980
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
8081
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
158159
github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c=
159160
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
160161
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
162+
github.com/elastic/go-elasticsearch v0.0.0 h1:Pd5fqOuBxKxv83b0+xOAJDAkziWYwFinWnBO0y+TZaA=
163+
github.com/elastic/go-elasticsearch v0.0.0/go.mod h1:TkBSJBuTyFdBnrNqoPc54FN0vKf5c04IdM4zuStJ7xg=
164+
github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
165+
github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
161166
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
162167
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
163168
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
206211
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
207212
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
208213
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
214+
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
209215
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
210216
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
211217
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=
647653
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
648654
github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
649655
github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
656+
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
650657
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
651658
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
652659
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=

‎manifests-endymx/deployment-auth-service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ spec:
6565
memory: 200Mi
6666
volumeMounts:
6767
- mountPath: /fluent-bit/etc
68-
name: gugotik-log-config
68+
name: config
6969
- mountPath: /var/log/gugotik
7070
name: log-volume
7171
volumes:
7272
- name: config
7373
configMap:
74-
name: fluentbit-config
74+
name: gugotik-log-config
7575
- name: log-volume
7676
emptyDir: { }
7777
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-comment-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: grpc-37003
4144
containerPort: 37003
@@ -50,4 +53,25 @@ spec:
5053
requests:
5154
cpu: 100m
5255
memory: 128Mi
56+
- name: logger
57+
image: fluent/fluent-bit:1.8.4
58+
imagePullPolicy: IfNotPresent
59+
resources:
60+
requests:
61+
cpu: 20m
62+
memory: 100Mi
63+
limits:
64+
cpu: 100m
65+
memory: 200Mi
66+
volumeMounts:
67+
- mountPath: /fluent-bit/etc
68+
name: config
69+
- mountPath: /var/log/gugotik
70+
name: log-volume
71+
volumes:
72+
- name: config
73+
configMap:
74+
name: gugotik-log-config
75+
- name: log-volume
76+
emptyDir: { }
5377
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-event-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: metrics-37099
4144
containerPort: 37099
@@ -47,4 +50,25 @@ spec:
4750
requests:
4851
cpu: 100m
4952
memory: 128Mi
53+
- name: logger
54+
image: fluent/fluent-bit:1.8.4
55+
imagePullPolicy: IfNotPresent
56+
resources:
57+
requests:
58+
cpu: 20m
59+
memory: 100Mi
60+
limits:
61+
cpu: 100m
62+
memory: 200Mi
63+
volumeMounts:
64+
- mountPath: /fluent-bit/etc
65+
name: config
66+
- mountPath: /var/log/gugotik
67+
name: log-volume
68+
volumes:
69+
- name: config
70+
configMap:
71+
name: gugotik-log-config
72+
- name: log-volume
73+
emptyDir: { }
5074
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-favorite-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: grpc-37006
4144
containerPort: 37006
@@ -50,4 +53,25 @@ spec:
5053
requests:
5154
cpu: 100m
5255
memory: 128Mi
56+
- name: logger
57+
image: fluent/fluent-bit:1.8.4
58+
imagePullPolicy: IfNotPresent
59+
resources:
60+
requests:
61+
cpu: 20m
62+
memory: 100Mi
63+
limits:
64+
cpu: 100m
65+
memory: 200Mi
66+
volumeMounts:
67+
- mountPath: /fluent-bit/etc
68+
name: config
69+
- mountPath: /var/log/gugotik
70+
name: log-volume
71+
volumes:
72+
- name: config
73+
configMap:
74+
name: gugotik-log-config
75+
- name: log-volume
76+
emptyDir: { }
5377
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-feed-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: grpc-37004
4144
containerPort: 37004
@@ -50,4 +53,25 @@ spec:
5053
requests:
5154
cpu: 100m
5255
memory: 128Mi
56+
- name: logger
57+
image: fluent/fluent-bit:1.8.4
58+
imagePullPolicy: IfNotPresent
59+
resources:
60+
requests:
61+
cpu: 20m
62+
memory: 100Mi
63+
limits:
64+
cpu: 100m
65+
memory: 200Mi
66+
volumeMounts:
67+
- mountPath: /fluent-bit/etc
68+
name: config
69+
- mountPath: /var/log/gugotik
70+
name: log-volume
71+
volumes:
72+
- name: config
73+
configMap:
74+
name: gugotik-log-config
75+
- name: log-volume
76+
emptyDir: { }
5377
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-http-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: http-37000
4144
containerPort: 37000
@@ -47,4 +50,25 @@ spec:
4750
requests:
4851
cpu: 100m
4952
memory: 128Mi
53+
- name: logger
54+
image: fluent/fluent-bit:1.8.4
55+
imagePullPolicy: IfNotPresent
56+
resources:
57+
requests:
58+
cpu: 20m
59+
memory: 100Mi
60+
limits:
61+
cpu: 100m
62+
memory: 200Mi
63+
volumeMounts:
64+
- mountPath: /fluent-bit/etc
65+
name: config
66+
- mountPath: /var/log/gugotik
67+
name: log-volume
68+
volumes:
69+
- name: config
70+
configMap:
71+
name: gugotik-log-config
72+
- name: log-volume
73+
emptyDir: { }
5074
terminationGracePeriodSeconds: 30

‎manifests-endymx/deployment-message-service.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ spec:
3636
name: gugotik-env
3737
- secretRef:
3838
name: gugotik-secret
39+
volumeMounts:
40+
- mountPath: /var/log/gugotik
41+
name: log-volume
3942
ports:
4043
- name: grpc-37007
4144
containerPort: 37007
@@ -50,4 +53,25 @@ spec:
5053
requests:
5154
cpu: 100m
5255
memory: 128Mi
56+
- name: logger
57+
image: fluent/fluent-bit:1.8.4
58+
imagePullPolicy: IfNotPresent
59+
resources:
60+
requests:
61+
cpu: 20m
62+
memory: 100Mi
63+
limits:
64+
cpu: 100m
65+
memory: 200Mi
66+
volumeMounts:
67+
- mountPath: /fluent-bit/etc
68+
name: config
69+
- mountPath: /var/log/gugotik
70+
name: log-volume
71+
volumes:
72+
- name: config
73+
configMap:
74+
name: gugotik-log-config
75+
- name: log-volume
76+
emptyDir: { }
5377
terminationGracePeriodSeconds: 30

0 commit comments

Comments
 (0)