Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
nightingale
提交
76ac2cd0
N
nightingale
项目概览
DiDi
/
nightingale
8 个月 前同步成功
通知
45
Star
7053
Fork
1161
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
nightingale
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
76ac2cd0
编写于
8月 03, 2023
作者:
N
ning
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor version api
上级
859876e3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
14 deletion
+30
-14
center/center.go
center/center.go
+2
-0
center/router/router.go
center/router/router.go
+1
-13
pkg/version/version.go
pkg/version/version.go
+27
-1
未找到文件。
center/center.go
浏览文件 @
76ac2cd0
...
...
@@ -20,6 +20,7 @@ import (
"github.com/ccfos/nightingale/v6/pkg/httpx"
"github.com/ccfos/nightingale/v6/pkg/i18nx"
"github.com/ccfos/nightingale/v6/pkg/logx"
"github.com/ccfos/nightingale/v6/pkg/version"
"github.com/ccfos/nightingale/v6/prom"
"github.com/ccfos/nightingale/v6/pushgw/idents"
"github.com/ccfos/nightingale/v6/pushgw/writer"
...
...
@@ -85,6 +86,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
writers
:=
writer
.
NewWriters
(
config
.
Pushgw
)
httpx
.
InitRSAConfig
(
&
config
.
HTTP
.
RSA
)
go
version
.
GetGithubVersion
()
alertrtRouter
:=
alertrt
.
New
(
config
.
HTTP
,
config
.
Alert
,
alertMuteCache
,
targetCache
,
busiGroupCache
,
alertStats
,
ctx
,
externalProcessors
)
centerRouter
:=
centerrt
.
New
(
config
.
HTTP
,
config
.
Center
,
cconf
.
Operations
,
dsCache
,
notifyConfigCache
,
promClients
,
redis
,
sso
,
ctx
,
metas
,
idents
,
targetCache
,
userCache
,
userGroupCache
)
...
...
center/router/router.go
浏览文件 @
76ac2cd0
...
...
@@ -26,7 +26,6 @@ import (
"github.com/rakyll/statik/fs"
"github.com/toolkits/pkg/ginx"
"github.com/toolkits/pkg/logger"
"github.com/toolkits/pkg/net/httplib"
"github.com/toolkits/pkg/runner"
)
...
...
@@ -388,14 +387,7 @@ func (rt *Router) Config(r *gin.Engine) {
v
=
version
.
Version
[
:
lastIndex
]
}
req
:=
httplib
.
Get
(
"https://api.github.com/repos/ccfos/nightingale/releases/latest"
)
var
release
GithubRelease
err
:=
req
.
ToJSON
(
&
release
)
if
err
!=
nil
{
ginx
.
NewRender
(
c
)
.
Data
(
gin
.
H
{
"version"
:
v
,
"github_verison"
:
""
},
nil
)
}
else
{
ginx
.
NewRender
(
c
)
.
Data
(
gin
.
H
{
"version"
:
v
,
"github_verison"
:
release
.
TagName
},
nil
)
}
ginx
.
NewRender
(
c
)
.
Data
(
gin
.
H
{
"version"
:
v
,
"github_verison"
:
version
.
GithubVersion
.
Load
()
.
(
string
)},
nil
)
})
if
rt
.
HTTP
.
APIForService
.
Enable
{
...
...
@@ -502,7 +494,3 @@ func Dangerous(c *gin.Context, v interface{}, code ...int) {
c
.
JSON
(
http
.
StatusOK
,
gin
.
H
{
"error"
:
t
.
Error
()})
}
}
type
GithubRelease
struct
{
TagName
string
`json:"tag_name"`
}
pkg/version/version.go
浏览文件 @
76ac2cd0
package
version
import
"github.com/hashicorp/go-version"
import
(
"sync/atomic"
"time"
"github.com/hashicorp/go-version"
"github.com/toolkits/pkg/logger"
"github.com/toolkits/pkg/net/httplib"
)
var
Version
=
"unknown"
var
GithubVersion
atomic
.
Value
func
CompareVersion
(
v1
,
v2
string
)
(
int
,
error
)
{
version1
,
err
:=
version
.
NewVersion
(
v1
)
...
...
@@ -22,3 +30,21 @@ func CompareVersion(v1, v2 string) (int, error) {
}
return
0
,
nil
}
func
GetGithubVersion
()
{
for
{
req
:=
httplib
.
Get
(
"https://api.github.com/repos/ccfos/nightingale/releases/latest"
)
var
release
GithubRelease
err
:=
req
.
ToJSON
(
&
release
)
if
err
!=
nil
{
logger
.
Errorf
(
"get github version fail: %v"
,
err
)
}
GithubVersion
.
Store
(
release
.
TagName
)
time
.
Sleep
(
24
*
time
.
Hour
)
}
}
type
GithubRelease
struct
{
TagName
string
`json:"tag_name"`
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录