Skip to content

Commit

Permalink
Add hc for logpool and set port for it
Browse files Browse the repository at this point in the history
  • Loading branch information
@myf5
myf5 committed Dec 28, 2021
2 parents 3f597ec + 426c878 commit 8a8ada5
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 26 deletions.
5 changes: 3 additions & 2 deletions config/ces-conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ tenant:
serverAddresses:
- "10.16.10.23"
logPool:
loggingEnabled: false
loggingEnabled: true
enableRemoteLog: false
healthMonitor: tcp
serverAddresses:
- "1.2.3.4"
- "1.2.3.4:514"
template: '{
"k8s_afm_hsl_log_profile": {
"network": {
Expand Down
18 changes: 11 additions & 7 deletions dist/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,14 @@ data:
logPool:
loggingEnabled: true
enableRemoteLog: false
healthMonitor: gateway_icmp
serverAddresses:
- "1.2.3.4"
- "1.2.3.4:514"
template: '{
"k8s_afm_hsl_log_profile": {
"network": {
"publisher": {
"use": "/Common/Shared/k8s_firewall_hsl_log_publisher"
"use": "/{{tenant}}/Shared/k8s_firewall_hsl_log_publisher"
},
"storageFormat": {
"fields": [
Expand Down Expand Up @@ -387,28 +388,28 @@ data:
"k8s_firewall_hsl_log_publisher": {
"destinations": [
{
"use": "/Common/Shared/k8s_remote-hsl-dest"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest"
},
{
"use": "/Common/Shared/k8s_remote-hsl-dest-format"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest-format"
},
{
"bigip": "/Common/local-db"
"bigip": "/{{tenant}}/local-db"
}
],
"class": "Log_Publisher"
},
"k8s_remote-hsl-dest": {
"pool": {
"use": "/Common/Shared/k8s_log_pool"
"use": "/{{tenant}}/Shared/k8s_log_pool"
},
"class": "Log_Destination",
"type": "remote-high-speed-log"
},
"k8s_remote-hsl-dest-format": {
"format": "rfc5424",
"remoteHighSpeedLog": {
"use": "/Common/Shared/k8s_remote-hsl-dest"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest"
},
"class": "Log_Destination",
"type": "remote-syslog"
Expand All @@ -419,6 +420,9 @@ data:
- name: "Common"
namespaces: ""
virtualService:
virtualAddress: "0.0.0.0"
icmpEcho: "disable"
arpEnabled: false
template: ''
virtualAddresses:
virtualAddress: "0.0.0.0"
Expand Down
5 changes: 3 additions & 2 deletions doc/zh_cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ logPool:
loggingEnabled: true
enableRemoteLog: false
serverAddresses:
- "1.2.3.4"
- "1.2.3.4:514"
template: '{
"k8s_afm_hsl_log_profile": {
"network": {
Expand Down Expand Up @@ -247,7 +247,8 @@ tenant：
logPool： ##日志
loggingEnabled： 是否配置log profile
enableRemoteLog： 是否开启远程日志
serverAddresses： pool中的ip列表
healthMonitor: 健康检查的方法 （tcp, udp， gateway_icmp）
serverAddresses： pool中的serverAddresses列表, 默认端口为514
template： 日志配置模板。可参考上面实例

```
Expand Down
1 change: 1 addition & 0 deletions pkg/as3/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ type (
LoggingEnabled bool `mapstructure:"loggingEnabled"`
//Whether to open remote log
EnableRemoteLog bool `mapstructure:"enableRemoteLog"`
HealthMonitor string `mapstructure:"healthMonitor"`
Template string `mapstructure:"template"`
ServerAddresses []string `mapstructure:"serverAddresses"`
}
Expand Down
37 changes: 29 additions & 8 deletions pkg/as3/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"net"
"reflect"
"strconv"
"strings"

"github.com/kubeovn/ces-controller/pkg/apis/kubeovn.io/v1alpha1"
Expand Down Expand Up @@ -336,17 +337,37 @@ func (ac *as3Post) newLogPoolDecl(sharedApp as3Application) {
sharedApp[k] = v
}
}
//servicePort default is 514
numbers := []Member{}
if len(log.ServerAddresses) != 0{
for _, v :=range log.ServerAddresses{
ips := strings.Split(v, ":")
ip := ips[0]
port := 514
if len(ips)> 1{
vs, err := strconv.Atoi(ips[1])
if err == nil{
port = vs
}
}
numbers = append(numbers, Member{
ServerAddresses: []string{ip},
ServicePort: port,
Enable: true,
})
}
}else {
numbers = append(numbers, Member{
ServerAddresses: []string{"0.0.0.0"},
ServicePort: 514,
Enable: true,
})
}
sharedApp[GetCluster()+"_log_pool"] = &Pool{
Class: ClassPoll,
Members: []Member{
Member{
ServerAddresses: log.ServerAddresses,
ServicePort: 0,
Enable: true,
},
},
Members: numbers,
Monitors: []Monitor{
Monitor{Bigip: "/Common/gateway_icmp"},
Monitor{Bigip: fmt.Sprintf("/%s/%s", DefaultPartition, log.HealthMonitor)},
},
}
}
Expand Down
16 changes: 9 additions & 7 deletions pkg/as3/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2743,13 +2743,15 @@ func TestRomteLog(t *testing.T) {
IsSupportRouteDomain: false,
LogPool: LogPool{
EnableRemoteLog: false,
ServerAddresses: []string{"1.1.1.1"},
LoggingEnabled: true,
HealthMonitor: "udp",
ServerAddresses: []string{"1.1.1.1:8888"},
Template: `
{
"k8s_afm_hsl_log_profile": {
"network": {
"publisher": {
"use": "/Common/Shared/k8s_firewall_hsl_log_publisher"
"use": "/{{tenant}}/Shared/k8s_firewall_hsl_log_publisher"
},
"storageFormat": {
"fields": [
Expand Down Expand Up @@ -2783,28 +2785,28 @@ func TestRomteLog(t *testing.T) {
"k8s_firewall_hsl_log_publisher": {
"destinations": [
{
"use": "/Common/Shared/k8s_remote-hsl-dest"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest"
},
{
"use": "/Common/Shared/k8s_remote-hsl-dest-format"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest-format"
},
{
"bigip": "/Common/local-db"
"bigip": "/{{tenant}}/local-db"
}
],
"class": "Log_Publisher"
},
"k8s_remote-hsl-dest": {
"pool": {
"use": "/Common/Shared/k8s_log_pool"
"use": "/{{tenant}}/Shared/k8s_log_pool"
},
"class": "Log_Destination",
"type": "remote-high-speed-log"
},
"k8s_remote-hsl-dest-format": {
"format": "rfc5424",
"remoteHighSpeedLog": {
"use": "/Common/Shared/k8s_remote-hsl-dest"
"use": "/{{tenant}}/Shared/k8s_remote-hsl-dest"
},
"class": "Log_Destination",
"type": "remote-syslog"
Expand Down

0 comments on commit 8a8ada5

Please sign in to comment.