Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
onlynone committed Nov 27, 2018
1 parent ef22caa commit 4ff4d46
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions influxql.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ type InfluxQLNode struct {

func newInfluxQLNode(et *ExecutingTask, n *pipeline.InfluxQLNode, d NodeDiagnostic) (*InfluxQLNode, error) {
m := &InfluxQLNode{
node: node{Node: n, et: et, diag: d},
n: n,
node: node{Node: n, et: et, diag: d},
n: n,
isStreamTransformation: n.ReduceCreater.IsStreamTransformation,
}
m.node.runF = m.runInfluxQL
Expand Down
12 changes: 6 additions & 6 deletions integrations/streamer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10116,9 +10116,9 @@ Value: {{ index .Fields "count" }}
"Mime-Version": []string{"1.0"},
"Content-Type": []string{"text/html; charset=UTF-8"},
"Content-Transfer-Encoding": []string{"quoted-printable"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"kapacitor.cpu.serverA is CRITICAL"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"kapacitor.cpu.serverA is CRITICAL"},
},
Body: `
<b>kapacitor.cpu.serverA is CRITICAL</b>
Expand All @@ -10132,9 +10132,9 @@ Value: 10
"Mime-Version": []string{"1.0"},
"Content-Type": []string{"text/html; charset=UTF-8"},
"Content-Transfer-Encoding": []string{"quoted-printable"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"kapacitor.cpu.serverA is CRITICAL"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"kapacitor.cpu.serverA is CRITICAL"},
},
Body: `
<b>kapacitor.cpu.serverA is CRITICAL</b>
Expand Down
54 changes: 27 additions & 27 deletions server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6671,12 +6671,12 @@ func TestServer_UpdateConfig(t *testing.T) {
Elements: []client.ConfigElement{{
Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"},
Options: map[string]interface{}{
"enabled": false,
"environment": "",
"origin": "",
"token": false,
"token-prefix": "",
"url": "http://alerta.example.com",
"enabled": false,
"environment": "",
"origin": "",
"token": false,
"token-prefix": "",
"url": "http://alerta.example.com",
"insecure-skip-verify": false,
"timeout": "0s",
},
Expand All @@ -6688,12 +6688,12 @@ func TestServer_UpdateConfig(t *testing.T) {
expDefaultElement: client.ConfigElement{
Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"},
Options: map[string]interface{}{
"enabled": false,
"environment": "",
"origin": "",
"token": false,
"token-prefix": "",
"url": "http://alerta.example.com",
"enabled": false,
"environment": "",
"origin": "",
"token": false,
"token-prefix": "",
"url": "http://alerta.example.com",
"insecure-skip-verify": false,
"timeout": "0s",
},
Expand All @@ -6715,12 +6715,12 @@ func TestServer_UpdateConfig(t *testing.T) {
Elements: []client.ConfigElement{{
Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"},
Options: map[string]interface{}{
"enabled": false,
"environment": "",
"origin": "kapacitor",
"token": true,
"token-prefix": "",
"url": "http://alerta.example.com",
"enabled": false,
"environment": "",
"origin": "kapacitor",
"token": true,
"token-prefix": "",
"url": "http://alerta.example.com",
"insecure-skip-verify": false,
"timeout": "3h0m0s",
},
Expand All @@ -6732,12 +6732,12 @@ func TestServer_UpdateConfig(t *testing.T) {
expElement: client.ConfigElement{
Link: client.Link{Relation: client.Self, Href: "/kapacitor/v1/config/alerta/"},
Options: map[string]interface{}{
"enabled": false,
"environment": "",
"origin": "kapacitor",
"token": true,
"token-prefix": "",
"url": "http://alerta.example.com",
"enabled": false,
"environment": "",
"origin": "kapacitor",
"token": true,
"token-prefix": "",
"url": "http://alerta.example.com",
"insecure-skip-verify": false,
"timeout": "3h0m0s",
},
Expand Down Expand Up @@ -10115,9 +10115,9 @@ func TestServer_AlertHandlers(t *testing.T) {
"Mime-Version": []string{"1.0"},
"Content-Type": []string{"text/html; charset=UTF-8"},
"Content-Transfer-Encoding": []string{"quoted-printable"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"message"},
"To": []string{"[email protected], [email protected]"},
"From": []string{"[email protected]"},
"Subject": []string{"message"},
},
Body: "details\n",
}}
Expand Down
2 changes: 1 addition & 1 deletion services/httpd/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func NewService(c Config, hostname string, d Diagnostic) *Service {
d,
"",
),
diag: d,
diag: d,
httpServerErrorLogger: d.NewHTTPServerErrorLogger(),
}
if s.key == "" {
Expand Down
2 changes: 1 addition & 1 deletion services/telegram/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type Config struct {

func NewConfig() Config {
return Config{
URL: DefaultTelegramURL,
URL: DefaultTelegramURL,
DisableWebPagePreview: DefaultTelegramLinksPreviewDisable,
DisableNotification: DefaultTelegramNotificationDisable,
}
Expand Down

0 comments on commit 4ff4d46

Please sign in to comment.