Skip to content

Commit a9180d7

Browse files
committed
Show gocd agent container information on the agent status report page
1 parent a85b236 commit a9180d7

File tree

2 files changed

+37
-12
lines changed

2 files changed

+37
-12
lines changed

src/main/java/cd/go/contrib/elasticagent/model/reports/agent/GoCDContainerDetails.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.fabric8.kubernetes.api.model.Container;
44
import io.fabric8.kubernetes.api.model.ContainerStatus;
55
import io.fabric8.kubernetes.api.model.EnvVar;
6+
import org.apache.commons.lang3.StringUtils;
67

78
import java.util.ArrayList;
89
import java.util.List;
@@ -47,20 +48,20 @@ public String getImagePullPolicy() {
4748
return imagePullPolicy;
4849
}
4950

50-
public List<String> getCommand() {
51-
return command;
51+
public String getCommand() {
52+
return StringUtils.join(command, '\n');
5253
}
5354

54-
public ArrayList<EnvironmentVariable> getEnv() {
55-
return env;
55+
public String getEnv() {
56+
return StringUtils.join(env, '\n');
5657
}
5758

58-
public Boolean getReady() {
59-
return ready;
59+
public String getReady() {
60+
return String.valueOf(ready);
6061
}
6162

62-
public Integer getRestartCount() {
63-
return restartCount;
63+
public String getRestartCount() {
64+
return String.valueOf(restartCount);
6465
}
6566

6667
private static class EnvironmentVariable {
@@ -79,5 +80,10 @@ public String getName() {
7980
public String getValue() {
8081
return value;
8182
}
83+
84+
@Override
85+
public String toString() {
86+
return String.format("%s: %s", getName(), getValue());
87+
}
8288
}
8389
}

src/main/resources/agent-status-report.template.ftlh

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<div class="tabs">
4848
<div class="tab">
49-
<input name="agent-information" type="radio" id="pod-details" class="checkboxtab pod-details" checked>
49+
<input name="agent-information" type="radio" id="pod-details" class="checkboxtab pod-details">
5050
<label for="pod-details">Pod Details</label>
5151
<dl class="content">
5252
<dt>Pod Name:</dt>
@@ -98,10 +98,29 @@
9898
</div>
9999

100100
<div class="tab">
101-
<input name="agent-information" type="radio" id="checkbox2" class="checkboxtab">
102-
<label for="checkbox2">Tab 2</label>
101+
<input name="agent-information" type="radio" id="agent-details" class="checkboxtab agent-details"
102+
checked>
103+
<label for="agent-details">GoCD Agent Details</label>
103104
<dl class="content">
104-
This is the content of tab 2
105+
<dt>Name:</dt>
106+
<dd>${ agentDetails.name !}</dd>
107+
<dt>Image:</dt>
108+
<dd>${ agentDetails.image !}</dd>
109+
<dt>ImagePullPolicy:</dt>
110+
<dd>${ agentDetails.imagePullPolicy !}</dd>
111+
112+
<dt>Ready:</dt>
113+
<dd>${ agentDetails.ready !}</dd>
114+
115+
<dt>Restart Count:</dt>
116+
<dd>${ agentDetails.restartCount !}</dd>
117+
118+
<dt>Command:</dt>
119+
<dd>${ agentDetails.command !}</dd>
120+
121+
<dt>Environment Variables:</dt>
122+
<dd>${ agentDetails.env !}</dd>
123+
105124
</dl>
106125
</div>
107126

0 commit comments

Comments
 (0)