Skip to content

[kube-prometheus-stack] Allow to set a timezone for the default grafana dashboards #1326

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 14 commits into from
Sep 20, 2021
Merged

[kube-prometheus-stack] Allow to set a timezone for the default grafana dashboards #1326

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a3ca3ce
Allow to set a timezone for the default grafana dashboards
krufab Sep 8, 2021
d703201
Updated chart version
krufab Sep 8, 2021
04216df
Merge branch 'main' into feature/timezone-fix
krufab Sep 15, 2021
0847c0d
#780 Improved regex
krufab Sep 15, 2021
2ff7c58
#780 Improved regex
krufab Sep 15, 2021
53998be
#780 Improved regex
krufab Sep 15, 2021
e98aeb6
#780 Improved regex
krufab Sep 15, 2021
89b76f0
#780 Improved regex
krufab Sep 15, 2021
ecc1fcb
Corrected typo in the regex replace value
krufab Sep 17, 2021
5caa532
Version bump
krufab Sep 17, 2021
d2e9004
Corrected typos
krufab Sep 17, 2021
4122604
Merge branch 'main' into feature/timezone-fix
krufab Sep 20, 2021
54ff00e
Varsion bump
krufab Sep 20, 2021
97f5a58
Merge branch 'main' into feature/timezone-fix
krufab Sep 20, 2021
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
Prev Previous commit
Next Next commit
#780 Improved regex 
Signed-off-by: Fabio Kruger <[email protected]>
  • Loading branch information
@krufab
krufab committed Sep 15, 2021
commit 89b76f0aee94cd524eee813cc6a32b0d6948c4e3
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def patch_json_for_multicluster_configuration(content, multicluster_key):

def patch_json_set_timezone_as_variable(content):
# content is no more in json format, so we have to replace using regex
return re.sub(r'"timezone"\s*:\s*"(\\.|[^\"])*"', '"timezone": "\{\{ .Value.grafana.defaultDashboardsTimezone \}\}"', content, flags=re.IGNORECASE|re.MULTILINE)
return re.sub(r'"timezone"\s*:\s*"(?:\\.|[^\"])*"', '"timezone": "\{\{ .Value.grafana.defaultDashboardsTimezone \}\}"', content, flags=re.IGNORECASE)


def write_group_to_file(resource_name, content, url, destination, min_kubernetes, max_kubernetes, multicluster_key):
Expand Down