Re-enable /monitoring/systems and /monitoring/node

templates/home.tmpl

@@ -38,7 +38,7 @@
                 <tr>
                     <th>Name</th>
                     <th>Jobs</th>
-                    <!-- <th>System View</th> -->
+                    <th>System View</th>
                     <!-- <th>Analysis View</th> -->
                 </tr>
             </thead>
@@ -47,7 +47,7 @@
                     <tr>
                         <td>{{.Name}}</td>
                         <td><a href="/monitoring/jobs/?cluster={{.Name}}">Jobs</a></td>
-                        <!-- <td><a href="/monitoring/systems/?cluster={{.Name}}">System View</a></td> -->
+                        <td><a href="/monitoring/systems/{{.Name}}">System View</a></td>
                         <!-- <td><a href="/monitoring/analysis/?cluster={{.Name}}">Analysis View</a></td> -->
                     </tr>
                 {{end}}

templates/monitoring/analysis.tmpl

@@ -1,18 +0,0 @@
-{{define "content"}}
-    <div id="svelte-app"></div>
-{{end}}
-
-{{define "stylesheets"}}
-    <link rel='stylesheet' href='/build/analysis.css'>
-{{end}}
-{{define "javascript"}}
-    <script>
-        const filterPresets = {{ .FilterPresets }};
-        const clusterCockpitConfigPromise = Promise.resolve({
-            plot_view_plotsPerRow:            {{ .Config.plot_view_plotsPerRow            }},
-            analysis_view_histogramMetrics:   {{ .Config.analysis_view_histogramMetrics   }},
-            analysis_view_scatterPlotMetrics: {{ .Config.analysis_view_scatterPlotMetrics }}
-        });
-    </script>
-    <script src='/build/analysis.js'></script>
-{{end}}

templates/monitoring/node.tmpl

@@ -7,15 +7,8 @@
 {{end}}
 {{define "javascript"}}
     <script>
-        const nodeInfos = {
-            nodeId: "{{ .Infos.nodeId }}",
-            clusterId: "{{ .Infos.clusterId }}"
-        };
-        const clusterCockpitConfigPromise = Promise.resolve({
-            plot_general_colorscheme:           {{ .Config.plot_general_colorscheme           }},
-            plot_general_lineWidth:             {{ .Config.plot_general_lineWidth             }},
-            plot_general_colorBackground:       {{ .Config.plot_general_colorBackground       }},
-        });
+        const infos = {{ .Infos }};
+        const clusterCockpitConfig = {{ .Config }};
     </script>
     <script src='/build/node.js'></script>
 {{end}}

templates/monitoring/systems.tmpl

@@ -7,13 +7,8 @@
 {{end}}
 {{define "javascript"}}
     <script>
-        const filterPresets = {{ .FilterPresets }};
-        const clusterCockpitConfigPromise = Promise.resolve({
-            plot_view_plotsPerRow:              {{ .Config.plot_view_plotsPerRow            }},
-            plot_general_colorscheme:           {{ .Config.plot_general_colorscheme           }},
-            plot_general_lineWidth:             {{ .Config.plot_general_lineWidth             }},
-            plot_general_colorBackground:       {{ .Config.plot_general_colorBackground       }},
-        });
+        const infos = {{ .Infos }};
+        const clusterCockpitConfig = {{ .Config }};
     </script>
     <script src='/build/systems.js'></script>
 {{end}}

templates/templates.go

@@ -34,9 +34,8 @@ func init() {
 		"monitoring/job.tmpl",
 		"monitoring/list.tmpl",
 		"monitoring/user.tmpl",
-		// "monitoring/analysis.tmpl",
-		// "monitoring/systems.tmpl",
-		// "monitoring/node.tmpl",
+		"monitoring/systems.tmpl",
+		"monitoring/node.tmpl",
 	}
 
 	for _, file := range files {