Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
a503c1d3
Commit
a503c1d3
authored
Oct 31, 2017
by
Sven Klemm
Committed by
Daniel Lee
Oct 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change default sslmode for postgres to verify-full (#9736)
parent
948a5259
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
docs/sources/installation/configuration.md
+2
-2
pkg/tsdb/postgres/postgres.go
+1
-1
No files found.
docs/sources/installation/configuration.md
View file @
a503c1d3
...
@@ -551,7 +551,7 @@ session provider you have configured.
...
@@ -551,7 +551,7 @@ session provider you have configured.
-
**file:**
session file path, e.g.
`data/sessions`
-
**file:**
session file path, e.g.
`data/sessions`
-
**mysql:**
go-sql-driver/mysql dsn config string, e.g.
`user:password@tcp(127.0.0.1:3306)/database_name`
-
**mysql:**
go-sql-driver/mysql dsn config string, e.g.
`user:password@tcp(127.0.0.1:3306)/database_name`
-
**postgres:**
ex: user=a password=b host=localhost port=5432 dbname=c sslmode=
require
-
**postgres:**
ex: user=a password=b host=localhost port=5432 dbname=c sslmode=
verify-full
-
**memcache:**
ex: 127.0.0.1:11211
-
**memcache:**
ex: 127.0.0.1:11211
-
**redis:**
ex:
`addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
-
**redis:**
ex:
`addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
...
@@ -580,7 +580,7 @@ CREATE TABLE session (
...
@@ -580,7 +580,7 @@ CREATE TABLE session (
)
;
)
;
```
```
Postgres valid
`sslmode`
are
`disable`
,
`require`
(default),
`verify-ca`
, and
`verify-full`
.
Postgres valid
`sslmode`
are
`disable`
,
`require`
,
`verify-ca`
, and
`verify-full`
(default)
.
### cookie_name
### cookie_name
...
...
pkg/tsdb/postgres/postgres.go
View file @
a503c1d3
...
@@ -51,7 +51,7 @@ func generateConnectionString(datasource *models.DataSource) string {
...
@@ -51,7 +51,7 @@ func generateConnectionString(datasource *models.DataSource) string {
}
}
}
}
sslmode
:=
datasource
.
JsonData
.
Get
(
"sslmode"
)
.
MustString
(
"
require
"
)
sslmode
:=
datasource
.
JsonData
.
Get
(
"sslmode"
)
.
MustString
(
"
verify-full
"
)
return
fmt
.
Sprintf
(
"postgres://%s:%s@%s/%s?sslmode=%s"
,
datasource
.
User
,
password
,
datasource
.
Url
,
datasource
.
Database
,
sslmode
)
return
fmt
.
Sprintf
(
"postgres://%s:%s@%s/%s?sslmode=%s"
,
datasource
.
User
,
password
,
datasource
.
Url
,
datasource
.
Database
,
sslmode
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment