From 8016a27abfeb799ff921d2b837a2b5c36014daac Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 25 Feb 2019 13:04:17 +0000 Subject: [PATCH] lbagent: telegraf: add params influx_db_output_unsafe_ssl --- pkg/compute/models/loadbalanceragents.go | 8 +++++--- pkg/lbagent/models/agentparams.go | 7 ++++--- pkg/mcclient/models/loadbalancers.go | 7 ++++--- pkg/mcclient/options/loadbalanceragents.go | 7 ++++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkg/compute/models/loadbalanceragents.go b/pkg/compute/models/loadbalanceragents.go index 32b512ebfb..8c376e155c 100644 --- a/pkg/compute/models/loadbalanceragents.go +++ b/pkg/compute/models/loadbalanceragents.go @@ -79,9 +79,10 @@ type SLoadbalancerAgentParamsHaproxy struct { } type SLoadbalancerAgentParamsTelegraf struct { - InfluxDbOutputUrl string - InfluxDbOutputName string - HaproxyInputInterval int + InfluxDbOutputUrl string + InfluxDbOutputName string + InfluxDbOutputUnsafeSsl bool + HaproxyInputInterval int } type SLoadbalancerAgentParams struct { @@ -524,6 +525,7 @@ listen stats [[outputs.influxdb]] urls = ["{{ .telegraf.influx_db_output_url }}"] database = "{{ .telegraf.influx_db_output_name }}" + insecure_skip_verify = {{ .telegraf.influx_db_output_unsafe_ssl }} [[inputs.haproxy]] interval = "{{ .telegraf.haproxy_input_interval }}s" diff --git a/pkg/lbagent/models/agentparams.go b/pkg/lbagent/models/agentparams.go index 6f8d51ea18..91032e1060 100644 --- a/pkg/lbagent/models/agentparams.go +++ b/pkg/lbagent/models/agentparams.go @@ -55,9 +55,10 @@ func NewAgentParams(agent *models.LoadbalancerAgent) (*AgentParams, error) { "log_normal": agent.Params.Haproxy.LogNormal, } dataTelegraf := map[string]interface{}{ - "influx_db_output_url": agent.Params.Telegraf.InfluxDbOutputUrl, - "influx_db_output_name": agent.Params.Telegraf.InfluxDbOutputName, - "haproxy_input_interval": agent.Params.Telegraf.HaproxyInputInterval, + "influx_db_output_url": agent.Params.Telegraf.InfluxDbOutputUrl, + "influx_db_output_name": agent.Params.Telegraf.InfluxDbOutputName, + "influx_db_output_unsafe_ssl": agent.Params.Telegraf.InfluxDbOutputUnsafeSsl, + "haproxy_input_interval": agent.Params.Telegraf.HaproxyInputInterval, } data := map[string]map[string]interface{}{ "agent": dataAgent, diff --git a/pkg/mcclient/models/loadbalancers.go b/pkg/mcclient/models/loadbalancers.go index 2c1b2cc6be..603f0799c8 100644 --- a/pkg/mcclient/models/loadbalancers.go +++ b/pkg/mcclient/models/loadbalancers.go @@ -195,9 +195,10 @@ type LoadbalancerAgentParamsHaproxy struct { } type LoadbalancerAgentParamsTelegraf struct { - InfluxDbOutputUrl string - InfluxDbOutputName string - HaproxyInputInterval int + InfluxDbOutputUrl string + InfluxDbOutputName string + InfluxDbOutputUnsafeSsl bool + HaproxyInputInterval int } type LoadbalancerAgentParams struct { diff --git a/pkg/mcclient/options/loadbalanceragents.go b/pkg/mcclient/options/loadbalanceragents.go index 9cd5499e16..4ff66a18fb 100644 --- a/pkg/mcclient/options/loadbalanceragents.go +++ b/pkg/mcclient/options/loadbalanceragents.go @@ -26,9 +26,10 @@ type LoadbalancerAgentParamsOptions struct { HaproxyLogTcp string `choices:"true|false"` HaproxyLogNormal string `choices:"true|false"` - TelegrafInfluxDbOutputUrl string - TelegrafInfluxDbOutputName string - TelegrafHaproxyInputInterval int + TelegrafInfluxDbOutputUrl string + TelegrafInfluxDbOutputName string + TelegrafInfluxDbOutputUnsafeSsl *bool + TelegrafHaproxyInputInterval int } func (opts *LoadbalancerAgentParamsOptions) setPrefixedParams(params *jsonutils.JSONDict, pref string) {