Skip to content

Fix opensearch grafana plugin at last working version #292

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

Merged
merged 19 commits into from
Aug 4, 2023
Merged

Fix opensearch grafana plugin at last working version #292

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
21503aa
fix opensearch grafana plugin at last working version
sjpb Aug 1, 2023
a9f5d33
Fix query type in the Slurm jobs Grafana dashboard
Aug 1, 2023
048e222
bump grafana opensearch plugin prior to fixing query type (i.e. this …
sjpb Aug 1, 2023
d9509ce
Merge pull request #293 from mkarpiarz/fix/slurm-jobs-grafana-dashboard
sjpb Aug 1, 2023
7f40e32
Increment iteration in slurm-jobs.json
m-bull Aug 1, 2023
eb10a25
fix slurmstats/opensearch datasource version configuration
sjpb Aug 2, 2023
b4c0279
use python3.9 for jupyter OOD app
sjpb Aug 2, 2023
f0db292
make eessi test async to avoid ansible timeouts
sjpb Aug 2, 2023
7d1f87c
Merge branch 'fix/jupyter' into fix/eessi-tests
sjpb Aug 2, 2023
854e491
extend eessi timeout
sjpb Aug 2, 2023
307f5ba
capture tensorflow EESSI test output
sjpb Aug 2, 2023
8cea013
disable EESSI tests in CI for now
sjpb Aug 3, 2023
c91c8ed
disable ssh session sharing for stackhpc
sjpb Aug 3, 2023
054d287
Revert "disable EESSI tests in CI for now"
sjpb Aug 3, 2023
aa6fb9c
Re-disable EESSI tests in CI for now
sjpb Aug 3, 2023
8c035d7
Merge pull request #295 from stackhpc/fix/eessi-tests
sjpb Aug 4, 2023
bae7255
reenable ControlMaster, adding ControlPath
sjpb Aug 4, 2023
6df61ae
Merge pull request #296 from stackhpc/fix/sms-ssh
sjpb Aug 4, 2023
af1c633
Merge pull request #294 from stackhpc/fix/jupyter
sjpb Aug 4, 2023
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
6 changes: 3 additions & 3 deletions ansible/roles/grafana-dashboards/files/slurm-jobs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"gnetId": 13535,
"graphTooltip": 0,
"id": null,
"iteration": 1607441312744,
"iteration": 1607441312745,
"links": [],
"panels": [
{
Expand Down Expand Up @@ -150,7 +150,7 @@
}
],
"query": "*",
"queryType": "randomWalk",
"queryType": "lucene",
"refId": "A",
"timeField": "@timestamp"
}
Expand Down Expand Up @@ -302,4 +302,4 @@
"uid": "jYPt7MTGk",
"version": 2,
"description": "Requires https://github.com/stackhpc/slurm-openstack-tools"
}
}
8 changes: 6 additions & 2 deletions environments/common/inventory/group_vars/all/grafana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ grafana_datasources:
url: "http://{{ prometheus_address }}:9090" # default prometheus port
editable: true
- name: slurmstats
# see https://github.com/grafana/opensearch-datasource#configure-the-data-source-with-provisioning
type: grafana-opensearch-datasource
url: "https://{{ opensearch_address }}:9200"
basicAuth: true
Expand All @@ -74,12 +75,15 @@ grafana_datasources:
tlsSkipVerify: true
database: filebeat-*
timeField: "@timestamp"
flavor: opensearch
# Have to set flavor and version, but ansible/roles/opensearch/templates/opensearch.yml.j2 fakes version for filebeat
# so need to set to fake version here:
version: '7.10.2'
flavor: elasticsearch
editable: true
# readOnly: false

grafana_plugins:
- grafana-opensearch-datasource
- grafana-opensearch-datasource 2.8.1

# want to set grafana_server.serve_from_sub_path if have Open Ondemand to proxy:
grafana_server:
Expand Down