Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge master into algo-w branch #18216

Merged
merged 20 commits into from
May 26, 2020
Merged

chore: merge master into algo-w branch #18216

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d361afc
chore(multiUser): remove feature flag (#18180)
121watts May 21, 2020
5ac45cc
fix: use skip-verify flag in ping
glinton Apr 16, 2020
7f4ddab
refactor: add new label package (#18078)
AlirieGray May 21, 2020
f1b3e97
Check statuses (#18171)
zoesteinkamp May 21, 2020
99074a2
fix: adjust dropdown width + changelog additions (#18185)
zoesteinkamp May 21, 2020
bf13e33
chore(reduce_honeybadger_noise): saveCheckFromTimeMachine was reporti…
asalem1 May 21, 2020
782a0d0
fix(customChecks): bring back custom check saving (#18194)
ebb-tide May 21, 2020
27b7a5d
fix(variable_hydration): reverted filter function to keep dashboards …
asalem1 May 22, 2020
083f72a
fix: when buckets are looked with a org name and bucket name (#18200)
lyondhill May 22, 2020
24ce360
chore(hb_parse_error): created a JSON validation function to prevent …
asalem1 May 22, 2020
78466ba
fix: Change max width to fix hover (#18189)
zoesteinkamp May 22, 2020
6e67fb4
feat: add query type for notebooks (#18168)
drdelambre May 22, 2020
743fb67
feat(notebooks): introduce markdown pipe type (#18181)
alexpaxton May 22, 2020
34775bc
fix(api/health): report version
sranka May 20, 2020
634d835
chore: update changelog
sranka May 20, 2020
c35c90a
feat(api/health): report commit
sranka May 26, 2020
d5846be
Merge pull request #18173 from influxdata/13907/addVersionToHealth
sranka May 26, 2020
715e2fb
fix(dbrpv2): reflect match count correctly (#18211)
gavincabbage May 26, 2020
e7e043f
chore(changelog): beta-11 release date
russorat May 26, 2020
7db9f4c
Merge branch 'master' into chore/merge-master
May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: use skip-verify flag in ping
  • Loading branch information
@glinton
glinton committed May 21, 2020
commit 5ac45ccb8a505b347bd61e4c250e85bad82d17a4
4 changes: 4 additions & 0 deletions cmd/influx/ping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"crypto/tls"
"encoding/json"
"fmt"
"net/http"
Expand All @@ -18,6 +19,9 @@ func cmdPing(f *globalFlags, opts genericCLIOpts) *cobra.Command {

c := http.Client{
Timeout: 5 * time.Second,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: flags.skipVerify},
},
}
url := flags.Host + "/health"
resp, err := c.Get(url)
Expand Down