More stuff for system status page

5 files changed, 161 insertions, 5 deletions

diff --git a/templates/systemstatus/_page.html b/templates/systemstatus/_page.html
index 5b1ab375..a62534da 100644
--- a/templates/systemstatus/_page.html
+++ b/templates/systemstatus/_page.html
@@ -1,13 +1,63 @@
 <div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Speicherplatz
+
+	<div class="row">
+
+		<div class="col-md-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					Speicherplatz
+				</div>
+				<div class="panel-body" id="diskstat">
+					*dreh dreh dreh dreh*
+				</div>
+			</div>
 		</div>
-		<div class="panel-body" id="diskstat">
-			*dreh dreh dreh dreh*
+
+		<div class="col-md-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					Dienste
+				</div>
+				<div class="panel-body" id="services">
+					*dreh dreh dreh dreh*
+				</div>
+			</div>
 		</div>
+
 	</div>
+
+
+	<div class="row">
+
+		<div class="col-md-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					Adresskonfiguration
+				</div>
+				<div class="panel-body" id="addresses">
+					*dreh dreh dreh dreh*
+				</div>
+			</div>
+		</div>
+
+		<div class="col-md-6">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					Systemlast
+				</div>
+				<div class="panel-body" id="systeminfo">
+					*dreh dreh dreh dreh*
+				</div>
+			</div>
+		</div>
+
+	</div>
+
 </div>
+
 <script type="text/javascript">
 	loadContent('#diskstat', '?do=SystemStatus&action=DiskStat');
+	loadContent('#addresses', '?do=SystemStatus&action=AddressList');
+	loadContent('#systeminfo', '?do=SystemStatus&action=SystemInfo');
+	loadContent('#services', '?do=SystemStatus&action=Services');
 </script>
diff --git a/templates/systemstatus/addresses.html b/templates/systemstatus/addresses.html
new file mode 100644
index 00000000..ce92c4d5
--- /dev/null
+++ b/templates/systemstatus/addresses.html
@@ -0,0 +1,8 @@
+<table class="slx-table">
+	{{#addresses}}
+	<tr {{#primary}} class="slx-bold" {{/primary}}>
+		<td>{{ip}}</td>
+		<td>({{iface}})</td>
+	</tr>
+	{{/addresses}}
+</table>
\ No newline at end of file
diff --git a/templates/systemstatus/diskstat.html b/templates/systemstatus/diskstat.html
index e1d4a57e..02487c0d 100644
--- a/templates/systemstatus/diskstat.html
+++ b/templates/systemstatus/diskstat.html
@@ -18,6 +18,8 @@
 	<b>Fehler beim Ermitteln des verfügbaren Speicherplatzes am VM-Speicherort. Bitte überprüfen Sie die Konfiguration.</b>
 	{{/store}}
 </div>
+<div class="clearfix"></div>
+<div>{{storeError}}</div>
 <script type="text/javascript">
 	{{#store}}
 	Circles.create({
diff --git a/templates/systemstatus/services.html b/templates/systemstatus/services.html
new file mode 100644
index 00000000..6c4f0b93
--- /dev/null
+++ b/templates/systemstatus/services.html
@@ -0,0 +1,6 @@
+{{#ldadpError}}
+<pre>{{ldadpError}}</pre>
+{{/ldadpError}}
+{{^ldadpError}}
+<div class="alert alert-success">LDAP-AD-Proxy: OK</div>
+{{/ldadpError}}
diff --git a/templates/systemstatus/systeminfo.html b/templates/systemstatus/systeminfo.html
new file mode 100644
index 00000000..86aefe8f
--- /dev/null
+++ b/templates/systemstatus/systeminfo.html
@@ -0,0 +1,90 @@
+<div class="slx-storechart">
+	<b>CPU-Last</b>
+	{{#cpuLoad}}
+	<div id="circles-cpuload"></div>
+	<div>Durchschnitt: {{cpuLoad}}%</div>
+	<div>Nur OS: {{cpuSystem}}%</div>
+	<div>Logische CPUs: {{cpuCount}}</div>
+	{{/cpuLoad}}
+	{{^cpuLoad}}
+	Konnte nicht ermittelt werden
+	{{/cpuLoad}}
+</div>
+			
+<div class="slx-storechart">
+	<b>RAM-Nutzung</b>
+	{{#memPercent}}
+	<div id="circles-mem"></div>
+	<div>Gesamt: {{memTotal}}</div>
+	<div>Frei: {{memFree}}</div>
+	{{/memPercent}}
+	{{^memPercent}}
+	Konnte nicht ermittelt werden
+	{{/memPercent}}
+</div>
+		
+<div class="slx-storechart">
+	<b>swap-Nutzung</b>
+	{{#swapPercent}}
+	<div id="circles-swap"></div>
+	<div>Gesamt: {{swapTotal}}</div>
+	<div>Belegt: {{swapUsed}}</div>
+	{{/swapPercent}}
+	{{^swapPercent}}
+	Konnte nicht ermittelt werden
+	{{/swapPercent}}
+</div>
+
+<div class="clearfix"></div>
+
+{{#swapWarning}}
+<div>
+	<b>Achtung!</b> Es wird swap-Speicher genutzt. Dies kann ein Hinweis darauf sein, dass der Satelliten-Server zu wenig physikalischen Speicher zur Verfügung hat. Im Falle von
+	Performance-Problemen oder Instabilität des Server sollten Sie erwägen, den Server mit mehr RAM auszustatten.
+</div>
+{{/swapWarning}}
+
+<script type="text/javascript">
+	{{#cpuLoad}}
+	Circles.create({
+	id:         'circles-cpuload',
+			  radius:     60,
+			  value:      {{{cpuLoad}}},
+			  maxValue:   100,
+			  width:      10,
+			  text:       function(value){return value + '%'; },
+			  colors:     ['#dbc', '#33f'],
+			  duration:   400,
+			  wrpClass:   'circles-wrp',
+			  textClass:  'circles-text'
+			  });
+	{{/cpuLoad}}
+	{{#memPercent}}
+	Circles.create({
+	id:         'circles-mem',
+			  radius:     60,
+			  value:      {{{memPercent}}},
+			  maxValue:   100,
+			  width:      10,
+			  text:       function(value){return value + '%'; },
+			  colors:     ['#dbc', '#33f'],
+			  duration:   400,
+			  wrpClass:   'circles-wrp',
+			  textClass:  'circles-text'
+			  });
+	{{/memPercent}}
+	{{#swapPercent}}
+	Circles.create({
+	id:         'circles-swap',
+			  radius:     60,
+			  value:      {{{swapPercent}}},
+			  maxValue:   100,
+			  width:      10,
+			  text:       function(value){return value + '%'; },
+			  colors:     ['#dbc', '#f33'],
+			  duration:   400,
+			  wrpClass:   'circles-wrp',
+			  textClass:  'circles-text'
+			  });
+	{{/swapPercent}}
+</script>
\ No newline at end of file