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
c764e3c3
Unverified
Commit
c764e3c3
authored
Sep 25, 2020
by
Will Browne
Committed by
GitHub
Sep 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove org deprecation logs (#27788)
parent
d3224172
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
29 deletions
+0
-29
pkg/services/sqlstore/sqlstore.go
+0
-29
No files found.
pkg/services/sqlstore/sqlstore.go
View file @
c764e3c3
...
...
@@ -104,11 +104,6 @@ func (ss *SqlStore) Init() error {
ss
.
addAlertNotificationUidByIdHandler
()
ss
.
addPreferencesQueryAndCommandHandlers
()
err
=
ss
.
logOrgsNotice
()
if
err
!=
nil
{
return
err
}
if
ss
.
skipEnsureDefaultOrgAndUser
{
return
nil
}
...
...
@@ -116,30 +111,6 @@ func (ss *SqlStore) Init() error {
return
ss
.
ensureMainOrgAndAdminUser
()
}
func
(
ss
*
SqlStore
)
logOrgsNotice
()
error
{
type
targetCount
struct
{
Count
int64
}
return
ss
.
WithDbSession
(
context
.
Background
(),
func
(
session
*
DBSession
)
error
{
resp
:=
make
([]
*
targetCount
,
0
)
if
err
:=
session
.
SQL
(
"select count(id) as Count from org"
)
.
Find
(
&
resp
);
err
!=
nil
{
return
err
}
if
resp
[
0
]
.
Count
>
1
{
ss
.
log
.
Warn
(
`[Deprecation notice]`
)
ss
.
log
.
Warn
(
`Fewer than 1% of Grafana installations use organizations, and we feel that most of those`
)
ss
.
log
.
Warn
(
`users would have a better experience using Teams instead. As such, we are considering de-emphasizing`
)
ss
.
log
.
Warn
(
`and eventually deprecating Organizations in a future Grafana release. If you would like to provide`
)
ss
.
log
.
Warn
(
`feedback or describe your need, please do so in the issue linked below`
)
ss
.
log
.
Warn
(
`https://github.com/grafana/grafana/issues/24588`
)
}
return
nil
})
}
func
(
ss
*
SqlStore
)
ensureMainOrgAndAdminUser
()
error
{
err
:=
ss
.
InTransaction
(
context
.
Background
(),
func
(
ctx
context
.
Context
)
error
{
systemUserCountQuery
:=
models
.
GetSystemUserCountStatsQuery
{}
...
...
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