Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
013d097e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
013d097e
编写于
11月 03, 2018
作者:
M
Mario de la Ossa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Usage ping - Differentiate Jira Server and Cloud
上级
f5d71ad8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
2 deletion
+34
-2
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+17
-1
spec/factories/services.rb
spec/factories/services.rb
+11
-0
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+6
-1
未找到文件。
lib/gitlab/usage_data.rb
浏览文件 @
013d097e
...
...
@@ -126,7 +126,6 @@ module Gitlab
# rubocop: disable CodeReuse/ActiveRecord
def
services_usage
types
=
{
JiraService
:
:projects_jira_active
,
SlackService
:
:projects_slack_notifications_active
,
SlackSlashCommandsService
:
:projects_slack_slash_active
,
PrometheusService
:
:projects_prometheus_active
...
...
@@ -134,6 +133,23 @@ module Gitlab
results
=
count
(
Service
.
unscoped
.
where
(
type:
types
.
keys
,
active:
true
).
group
(
:type
),
fallback:
Hash
.
new
(
-
1
))
types
.
each_with_object
({})
{
|
(
klass
,
key
),
response
|
response
[
key
]
=
results
[
klass
.
to_s
]
||
0
}
.
merge
(
jira_usage
)
end
def
jira_usage
# Jira Cloud does not support custom domains as per https://jira.atlassian.com/browse/CLOUD-6999
# so we can just check for subdomains of atlassian.net
services
=
count
(
Service
.
unscoped
.
where
(
type: :JiraService
,
active:
true
)
.
group
(
"CASE WHEN properties LIKE '%.atlassian.net%' THEN 'cloud' ELSE 'server' END"
),
fallback:
Hash
.
new
(
-
1
)
)
{
projects_jira_server_active:
services
[
'server'
]
||
0
,
projects_jira_cloud_active:
services
[
'cloud'
]
||
0
,
projects_jira_active:
services
[
'server'
]
==
-
1
?
-
1
:
services
.
values
.
sum
}
end
def
count
(
relation
,
fallback:
-
1
)
...
...
spec/factories/services.rb
浏览文件 @
013d097e
...
...
@@ -46,6 +46,17 @@ FactoryBot.define do
)
end
factory
:jira_cloud_service
,
class:
JiraService
do
project
active
true
properties
(
url:
'https://mysite.atlassian.net'
,
username:
'jira_user'
,
password:
'my-secret-password'
,
project_key:
'jira-key'
)
end
factory
:hipchat_service
do
project
type
'HipchatService'
...
...
spec/lib/gitlab/usage_data_spec.rb
浏览文件 @
013d097e
...
...
@@ -8,6 +8,7 @@ describe Gitlab::UsageData do
before
do
create
(
:jira_service
,
project:
projects
[
0
])
create
(
:jira_service
,
project:
projects
[
1
])
create
(
:jira_cloud_service
,
project:
projects
[
2
])
create
(
:prometheus_service
,
project:
projects
[
1
])
create
(
:service
,
project:
projects
[
0
],
type:
'SlackSlashCommandsService'
,
active:
true
)
create
(
:service
,
project:
projects
[
1
],
type:
'SlackService'
,
active:
true
)
...
...
@@ -95,6 +96,8 @@ describe Gitlab::UsageData do
projects
projects_imported_from_github
projects_jira_active
projects_jira_server_active
projects_jira_cloud_active
projects_slack_notifications_active
projects_slack_slash_active
projects_prometheus_active
...
...
@@ -114,7 +117,9 @@ describe Gitlab::UsageData do
expect
(
count_data
[
:projects
]).
to
eq
(
3
)
expect
(
count_data
[
:projects_prometheus_active
]).
to
eq
(
1
)
expect
(
count_data
[
:projects_jira_active
]).
to
eq
(
2
)
expect
(
count_data
[
:projects_jira_active
]).
to
eq
(
3
)
expect
(
count_data
[
:projects_jira_server_active
]).
to
eq
(
2
)
expect
(
count_data
[
:projects_jira_cloud_active
]).
to
eq
(
1
)
expect
(
count_data
[
:projects_slack_notifications_active
]).
to
eq
(
2
)
expect
(
count_data
[
:projects_slack_slash_active
]).
to
eq
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录