Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/misc fixes #97

Merged
merged 3 commits into from
Mar 12, 2024
Merged

Feat/misc fixes #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf009ca
js: imroved the handling of dots in node name
rchakode Mar 12, 2024
26b1a29
added sa token in rbac resources
rchakode Mar 12, 2024
3c9122d
used ubuntu 22.04 in Dockerfile
rchakode Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:23.04
FROM ubuntu:22.04

ARG RUNTIME_USER="koa"
ARG RUNTIME_USER_UID=4583
Expand Down
14 changes: 8 additions & 6 deletions js/frontend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',
for (let nname in data) {
if (data.hasOwnProperty(nname)) {
let node = data[nname];
nodeHtmlList += '<li><a href="#" data-toggle="modal" data-target="#' + node.id + '">' + node.name + '</a></li>';
let nname4Css = nname.replace('.', '_');
nodeHtmlList += '<li><a href="#" data-toggle="modal" data-target="#' + node.id + '">' + nname4Css + '</a></li>';
popupContent += createPopupContent(node);
}
}
Expand Down Expand Up @@ -463,19 +464,21 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',
let dynHtml = '';
let donuts = new Map();
for (let [nname, _] of dataset.data) {
let nname4Css = nname.replace('.', '_');
donuts[nname] = donut();
dynHtml += '<div class="col-md-4">';
dynHtml += ' <h4>' + nname + '</h4>';
dynHtml += ' <div class="js-' + nname + '"></div>';
dynHtml += ' <div class="js-' + nname + '-legend" britechart-legend"></div>';
dynHtml += ' <div class="js-' + nname4Css + '"></div>';
dynHtml += ' <div class="js-' + nname4Css + '-legend" britechart-legend"></div>';
dynHtml += '</div>';
}
$("#js-nodes-load-container").html(dynHtml);
for (let [nname, ndata] of dataset.data) {
let nname4Css = nname.replace('.', '_');
updateDonutChart(ndata['chartData'],
donuts[nname],
'js-' + nname,
'js-' + nname + '-legend');
'js-' + nname4Css,
'js-' + nname4Css + '-legend');
}
},
error: function (xhr, ajaxOptions, thrownError) {
Expand Down Expand Up @@ -503,7 +506,6 @@ define(['jquery', 'bootstrap', 'bootswatch', 'd3Selection', 'stackedAreaChart',

function showCumulativeUsageByType() {
cumulativeUsageType = $("#selected-cumulative-usage-type option:selected").val();
console.log(cumulativeUsageType);
if (cumulativeUsageType === 'monthly-usage') {
$("#chart-block-daily").hide();
$("#chart-block-monthly").show();
Expand Down
9 changes: 9 additions & 0 deletions manifests/helm/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ metadata:
labels:
{{- include "kube-opex-analytics.labels" . | nindent 4 }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "kube-opex-analytics.fullname" . }}
namespace: {{ .Release.Namespace }}
annotations:
kubernetes.io/service-account.name: {{ include "kube-opex-analytics.fullname" . }}
type: kubernetes.io/service-account-token
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
9 changes: 9 additions & 0 deletions manifests/kustomize/resources/kube-opex-analytics-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ metadata:
app.kubernetes.io/instance: kube-opex-analytics
app: kube-opex-analytics
---
apiVersion: v1
kind: Secret
metadata:
name: kube-opex-analytics
namespace: kube-opex-analytics
annotations:
kubernetes.io/service-account.name: "kube-opex-analytics"
type: kubernetes.io/service-account-token
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
Loading