The Unified and Autonomous Development Platform
Add some agent help
Robin Shen65922d0afbea
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.htmlindex cf85ece80c..6ea3a66f9c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html@@ -35,6 +35,12 @@</div></div></div>+ <wicket:fragment wicket:id="cpuHeaderFrag">+ <span class="mr-1">CPU</span> <a title="CPU capability in millis. This is normally (CPU cores)*1000"><wicket:svg href="question-o" class="icon icon-sm"/></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="memoryHeaderFrag">+ <span class="mr-1">Memory</span> <a title="Physical memory in mega bytes"><wicket:svg href="question-o" class="icon icon-sm"/></a>+ </wicket:fragment><wicket:fragment wicket:id="agentLinkFrag"><a wicket:id="link" class="d-flex align-items-center"><svg wicket:id="icon" class="icon icon-lg mr-1"></svg> <span wicket:id="label"></span></a></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex 8a020bd670..9392a52b12 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -835,6 +835,11 @@ class AgentListPanel extends Panel {public String getCssClass() {return "d-none d-lg-table-cell";}++ @Override+ public Component getHeader(String componentId) {+ return new Fragment(componentId, "cpuHeaderFrag", AgentListPanel.this);+ }});@@ -851,6 +856,11 @@ class AgentListPanel extends Panel {return "d-none d-lg-table-cell";}+ @Override+ public Component getHeader(String componentId) {+ return new Fragment(componentId, "memoryHeaderFrag", AgentListPanel.this);+ }+});columns.add(new AbstractColumn<Agent, Void>(Model.of("Status")) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.htmlindex 2b031cac70..b52bdde8b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html@@ -10,8 +10,8 @@<th>IP Address</th><th class="d-none d-lg-table-cell">OS Version</th><th class="d-none d-lg-table-cell">OS Arch</th>- <th class="d-none d-lg-table-cell">CPU</th>- <th class="d-none d-lg-table-cell">Memory</th>+ <th class="d-none d-lg-table-cell"><span class="mr-1">CPU</span> <a title="CPU capability in millis. This is normally (CPU cores)*1000"><wicket:svg href="question-o" class="icon icon-sm"/></a></th>+ <th class="d-none d-lg-table-cell"><span class="mr-1">Memory</span> <a title="Physical memory in mega bytes"><wicket:svg href="question-o" class="icon icon-sm"/></a></th><th>Status</th></thead><tbody>diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.javaindex 1dbcbc71d4..2251802e1b 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java@@ -77,7 +77,27 @@ public class AgentResource extends AbstractResource {props.setProperty("agentToken", token.getValue());try (OutputStream os = new FileOutputStream(new File(agentDir, "agent/conf/agent.properties"))) {- props.store(os, "");+ String comment = String.format(""+ + " %s: required property to specify url of OneDev server\n"+ + " %s: required property to authenticate to OneDev server.\n"+ + " Will be generated automatically when agent is\n"+ + " downloaded. Can be generated manually from agent\n"+ + " management page if desired\n"+ + " %s: optional property to specify name of the agent.\n"+ + " Use host name if omitted\n"+ + " %s: optional property to specify cpu capability of the\n"+ + " agent in millis. It is normally (cpu cores)*1000.\n"+ + " Omitted to detect automatically\n"+ + " %s: optional property to specify physical memory of the\n"+ + " agent in mega bytes. Omitted to detect automatically\n"+ + " %s: optional property to specify path to git command\n"+ + " line. Omitted to search in system path\n"+ + " %s: optional property to specify path to docker command\n"+ + " line. Omitted to search in system path\n"+ + "",+ Agent.SERVER_URL_KEY, Agent.AGENT_TOKEN_KEY, Agent.AGENT_NAME_KEY,+ Agent.AGENT_CPU_KEY, Agent.AGENT_MEMORY_KEY, Agent.GIT_PATH_KEY, Agent.DOCKER_PATH_KEY);+ props.store(os, comment);}try (