selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(coderd): add sftp to insights apps (#12675)

This commit is contained in:
Mathias Fredriksson 2024-03-27 14:09:29 +02:00 committed by GitHub
parent 6cb1fc8956
commit ba1eaceda4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coderd/insights.go
View File

@ -474,6 +474,14 @@ func convertTemplateInsightsApps(usage database.GetTemplateInsightsRow, appUsage
Icon: "/icon/terminal.svg", Icon: "/icon/terminal.svg",
Seconds: usage.UsageSshSeconds, Seconds: usage.UsageSshSeconds,
}, },
{
TemplateIDs: usage.SftpTemplateIds,
Type: codersdk.TemplateAppsTypeBuiltin,
DisplayName: codersdk.TemplateBuiltinAppDisplayNameSFTP,
Slug: "sftp",
Icon: "/icon/terminal.svg",
Seconds: usage.UsageSftpSeconds,
},
} }
// Use a stable sort, similarly to how we would sort in the query, note that // Use a stable sort, similarly to how we would sort in the query, note that

8
coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden vendored
View File

@ -45,6 +45,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 10800 "seconds": 10800
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000002" "00000000-0000-0000-0000-000000000002"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden vendored
View File

@ -45,6 +45,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 10800 "seconds": 10800
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000002" "00000000-0000-0000-0000-000000000002"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_all_templates.json.golden vendored
View File

@ -52,6 +52,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 11520 "seconds": 11520
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000001",

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_deployment_wide.json.golden vendored
View File

@ -52,6 +52,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 11520 "seconds": 11520
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000001",

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_first_template.json.golden vendored
View File

@ -45,6 +45,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 7920 "seconds": 7920
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001" "00000000-0000-0000-0000-000000000001"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_other_timezone_(São_Paulo).json.golden vendored
View File

@ -47,6 +47,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 4320 "seconds": 4320
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000001",

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden vendored
View File

@ -43,6 +43,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 3600 "seconds": 3600
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000002" "00000000-0000-0000-0000-000000000002"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_week_third_template.json.golden vendored
View File

@ -43,6 +43,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 3600 "seconds": 3600
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000003" "00000000-0000-0000-0000-000000000003"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_deployment_wide.json.golden vendored
View File

@ -52,6 +52,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 15120 "seconds": 15120
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000001",

8
coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_first_template.json.golden vendored
View File

@ -45,6 +45,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 7920 "seconds": 7920
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001" "00000000-0000-0000-0000-000000000001"

8
coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_templates.json.golden vendored
View File

@ -52,6 +52,14 @@
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 15120 "seconds": 15120
}, },
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
},
{ {
"template_ids": [ "template_ids": [
"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000001",

8
coderd/testdata/insights/template/parameters_two_days_ago,_no_data.json.golden vendored
View File

@ -36,6 +36,14 @@
"slug": "ssh", "slug": "ssh",
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 0 "seconds": 0
},
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
} }
], ],
"parameters_usage": [] "parameters_usage": []

8
coderd/testdata/insights/template/parameters_yesterday_and_today_deployment_wide.json.golden vendored
View File

@ -36,6 +36,14 @@
"slug": "ssh", "slug": "ssh",
"icon": "/icon/terminal.svg", "icon": "/icon/terminal.svg",
"seconds": 0 "seconds": 0
},
{
"template_ids": [],
"type": "builtin",
"display_name": "SFTP",
"slug": "sftp",
"icon": "/icon/terminal.svg",
"seconds": 0
} }
], ],
"parameters_usage": [ "parameters_usage": [

1
codersdk/insights.go
View File

@ -206,6 +206,7 @@ const (
TemplateBuiltinAppDisplayNameJetBrains string = "JetBrains" TemplateBuiltinAppDisplayNameJetBrains string = "JetBrains"
TemplateBuiltinAppDisplayNameWebTerminal string = "Web Terminal" TemplateBuiltinAppDisplayNameWebTerminal string = "Web Terminal"
TemplateBuiltinAppDisplayNameSSH string = "SSH" TemplateBuiltinAppDisplayNameSSH string = "SSH"
TemplateBuiltinAppDisplayNameSFTP string = "SFTP"
) )
// TemplateAppUsage shows the usage of an app for one or more templates. // TemplateAppUsage shows the usage of an app for one or more templates.