Display exchangeTotal metric in the application list. Remove service proxy k8s manifests.

Author: claudio4j

charts/openshift-console-plugin/templates/consoleplugin.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "openshift-console-plugin.labels" . | nindent 4 }}
 spec:
   displayName: {{ default (printf "%s Plugin" (include "openshift-console-plugin.name" .)) .Values.plugin.description }}
-  i18n: 
+  i18n:
     loadType: Preload
   backend:
     type: Service
@@ -16,12 +16,3 @@ spec:
       namespace: {{ .Release.Namespace }}
       port: {{ .Values.plugin.port }}
       basePath: {{ .Values.plugin.basePath }}
-  proxy:
-  - type: Service
-    alias: {{ .Values.serviceProxy.alias }}
-    endpoint:
-      type: Service
-      service:
-        name: {{ .Values.serviceProxy.name }}
-        namespace: {{ .Release.Namespace }}
-        port: 443

charts/openshift-console-plugin/templates/proxy-buildconfig.yaml

@@ -18,6 +18,7 @@ export const ApplicationList: React.FC<ApplicationListProps> = ({ apps }) => {
     namespace: 'Namespace',
     status: 'Status',
     runtime: 'Runtime',
+    exchangesTotal: 'Exchanges',
     cpu: 'CPU',
     memory: 'Memory',
   };
@@ -213,6 +214,7 @@ export const ApplicationList: React.FC<ApplicationListProps> = ({ apps }) => {
                   <span className="sort-icon">{sortDirection === "asc" ? "▲" : "▼"}</span>
                 )}
               </Th>
+              <Th>{columnNames.exchangesTotal}</Th>
               <Th
                 onClick={() => toggleSort("cpu")}
                 className={sortColumn === "cpu" ? `sorted ${sortDirection}` : ""}
@@ -252,6 +254,7 @@ export const ApplicationList: React.FC<ApplicationListProps> = ({ apps }) => {
                         <Status title={`${app.cronStatus.lastSuccessfulTime}`} status={app.cronStatus.lastSuccessfulTime ? "Succeeded" : "Failed"}/>
                     }
                 </Td>
+                <Td dataLabel={columnNames.exchangesTotal}>{app.exchangesTotal}</Td>
                 <Td dataLabel={columnNames.cpu}>{app.cpu}</Td>
                 <Td dataLabel={columnNames.memory}>{app.memory}</Td>
                 <Td dataLabel={columnNames.runtime}>Camel: {app.metadata.annotations['camel/camel-core-version']}</Td>

charts/openshift-console-plugin/templates/proxy-deploymentconfig.yaml

@@ -143,7 +143,7 @@ const ApplicationLoggingCard: React.FC<{application: Application, active?: boole
                   </ToolbarToggleGroup>
                 </ToolbarContent>
               </Toolbar>
-              <Table>
+              <Table aria-label="Log Level">
                 <Thead>
                   <Tr>
                     <Th>Name</Th>

charts/openshift-console-plugin/templates/proxy-imagestream.yaml

@@ -105,7 +105,7 @@ export async function fetchJob(ns: string, name: string): Promise<JobKind> {
 }
 
 export async function populateAdddionalInfo(app: Application): Promise<Application> {
-    return populateCpu(app).then(populateCpuMetrics).then(populateMem).then(populateMemMetrics);
+    return populateCpu(app).then(populateCpuMetrics).then(populateMem).then(populateMemMetrics).then(populateExchangesTotal);
 }
 
 async function populateCpu(app: Application): Promise<Application> {
@@ -243,6 +243,20 @@ export async function populateGCOverheadMetrics(app: Application): Promise<Appli
     });
 }
 
+async function populateExchangesTotal(app: Application): Promise<Application> {
+    const ns = 'namespace="' + app.metadata.namespace + '"';
+    const query = 'query=avg(camel_exchanges_total{' + ns + ',service="' + app.metadata.name + '"})';
+    const queryUrl = PROMETHEUS_API_QUERY_PATH + '?' + query + '&' + ns;
+
+    return consoleFetchJSON(queryUrl).then((res) => {
+            let newApp: Application = { ...app };
+            if (res && res.data && res.data && res.data.result && res.data.result.length > 0 && res.data.result[0].value && res.data.result[0].value.length > 1) {
+                newApp.exchangesTotal = sprintf('%.0f', res.data.result[0].value[1]);
+            }
+            return newApp;
+        });
+}
+
 /* export async function populateRoute(app: Application): Promise<Application> {
     return consoleFetchJSON('/api/kubernetes/apis/route.openshift.io/v1/namespaces/' + app.metadata.namespace + '/routes/' + app.metadata.name).then((route: RouteKind) => {
         let newApp: Application = { ...app };
@@ -312,6 +326,7 @@ export async function fetchApplication(kind: string, ns: string, name: string):
 }
 
 export async function fetchApplicationWithMetrics(kind: string, ns: string, name: string): Promise<Application> {
+    console.log("> fetchApplicationWithMetrics ns: " + ns + ", name: " + name);
     let app: Promise<Application>;
     switch (kind) {
         case 'Deployment':

charts/openshift-console-plugin/templates/proxy-rolebinding.yaml

@@ -19,6 +19,7 @@ export type Application = {
   kind? : string;
   cpu?: string;
   memory?: string;
+  exchangesTotal?: string;
   url?: string;
   metrics?: Metrics;
   spec?: PodSpec;