Skip to content

fix: issue #9 #10

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
thenodon merged 1 commit into from
May 7, 2025
Merged

fix: issue #9 #10

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
30 changes: 1 addition & 29 deletions gonb/grafana.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ def _get_all_folders(self, organisation: Organization) -> Dict[str, Folder]:
folders_by_uid: Dict[str, Folder] = {}
folders_by_title: Dict[str, Folder] = {}
# Search in top folder
_, folders_data = self._get_by_api_key('api/search?folderIds=0&type=dash-folder', api_key=organisation.api_key)
_, folders_data = self._get_by_api_key('api/search?type=dash-folder', api_key=organisation.api_key)
for folder_data in folders_data:
folder = folder_factory(folder_data)
_, permissions_data = self._get_by_api_key(f"api/folders/{folder.uid}/permissions",
Expand All @@ -1115,34 +1115,6 @@ def _get_all_folders(self, organisation: Organization) -> Dict[str, Folder]:

return folders_by_title

def _get_all_folders_OLD(self, organisation: Organization) -> Dict[str, Folder]:
"""
Get all existing folders related to an organisation.
:param organisation:
:return:
"""
folders_by_uid: Dict[str, Folder] = {}
folders_by_title: Dict[str, Folder] = {}
# Search in top folder
_, folders_data = self._get_by_api_key('api/search?folderIds=0&type=dash-folder', api_key=organisation.api_key)
for folder_data in folders_data:
folder = folder_factory(folder_data)
_, permissions_data = self._get_by_api_key(f"api/folders/{folder.uid}/permissions",
api_key=organisation.api_key)
for permission_data in permissions_data:
permission = permission_factory(permission_data)
folder.permissions.append(permission)

folders_by_uid[folder.uid] = folder

for folder in folders_by_uid.values():
if folder.title not in folders_by_title:
folders_by_title[folder.title] = folder
else:
raise GrafanaException(f"Folder title already exists {folder.title}")

return folders_by_title

@staticmethod
def _list_of_dict_values(alist: List[Dict], key: str):
parsed_list = []
Expand Down