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

Jump to bottom

Use the ui from testkube #389

Merged
merged 1 commit into from
May 8, 2023
Merged

Use the ui from testkube #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@

- Added more scenarios on federating learning
- Add autocompletion on kubectl-frisbee

- Add wait function on report

## Bug Fixes

- Upgrade golang.org/x/net to v0.7.0 to avoid security bugs
- Fix `kubectl-frisbee report` to evaluate dashboard variables (returns `.+` always).

## 1.0.37 \[2023-02-02\]
6 changes: 2 additions & 4 deletions charts/platform/templates/deployment/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ spec:
containers:
- name: manager
image: icsforth/frisbee-operator:latest
imagePullPolicy: Always
ports:
- name: "admission-hook" # Admission Webhooks
containerPort: {{.Values.operator.webhook.k8s.port | int64}}
Expand All @@ -46,10 +47,7 @@ spec:
- /bin/sh # Run shell
- -c # Read from string
- | # Multi-line str
~/manager \
-cert-dir=/tmp/k8s-webhook-server/serving-certs \
-webhook-port={{.Values.operator.webhook.k8s.port}} \
--alerting-port={{.Values.operator.webhook.grafana.port}}
~/manager -cert-dir=/tmp/k8s-webhook-server/serving-certs

livenessProbe:
httpGet:
Expand Down
74 changes: 26 additions & 48 deletions charts/system/dashboards/selectable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": 3,
"id": 1,
"links": [],
"liveNow": false,
"panels": [
Expand Down Expand Up @@ -1763,8 +1763,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -1949,8 +1948,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2104,8 +2102,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2309,8 +2306,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2494,8 +2490,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2663,8 +2658,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2752,8 +2746,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -2846,8 +2839,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3046,8 +3038,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3248,8 +3239,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3368,8 +3358,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3487,8 +3476,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3608,8 +3596,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3754,8 +3741,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -3954,8 +3940,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -4157,8 +4142,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -4334,8 +4318,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -4514,8 +4497,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -4693,8 +4675,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -4900,8 +4881,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -5032,8 +5012,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -5208,8 +5187,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand Down Expand Up @@ -5337,7 +5315,7 @@
"type": "timeseries"
}
],
"refresh": "10s",
"refresh": "30s",
"schemaVersion": 37,
"style": "dark",
"tags": [
Expand Down Expand Up @@ -5373,7 +5351,7 @@
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 3,
"sort": 1,
"type": "query"
},
{
Expand Down Expand Up @@ -5403,7 +5381,7 @@
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 3,
"sort": 1,
"type": "query"
}
]
Expand Down
8 changes: 4 additions & 4 deletions charts/system/dashboards/singleton.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": 1,
"id": 2,
"links": [],
"liveNow": false,
"panels": [
Expand Down Expand Up @@ -4156,7 +4156,7 @@
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 2,
"sort": 1,
"type": "query"
},
{
Expand All @@ -4182,7 +4182,7 @@
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 2,
"sort": 1,
"type": "query"
}
]
Expand Down Expand Up @@ -4219,6 +4219,6 @@
"timezone": "",
"title": "Frisbee SUT Monitoring (Singleton)",
"uid": "singleton",
"version": 3,
"version": 1,
"weekStart": ""
}
9 changes: 6 additions & 3 deletions charts/system/templates/telemetry/grafana/grafana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ data:
editable: true


grafana.ini: |
# For more options see https://github.com/grafana/grafana/blob/main/conf/defaults.ini

grafana.ini: | # For more options see https://github.com/grafana/grafana/blob/main/conf/defaults.ini
#################################### Paths ###############################
#[paths]
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
Expand Down Expand Up @@ -118,3 +116,8 @@ data:

# specify role for unauthenticated users (Viewer, Editor, Admin)
org_role = Admin


#################################### Analytics ###########################
check_for_updates = false
check_for_plugin_updates = false
2 changes: 1 addition & 1 deletion cmd/kubectl-frisbee/commands/common/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"

"github.com/carv-ics-forth/frisbee/cmd/kubectl-frisbee/env"
"github.com/carv-ics-forth/frisbee/pkg/ui"
"github.com/kubeshop/testkube/pkg/ui"
"github.com/spf13/cobra"
)

Expand Down
Loading