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.

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

Add folder permissions backup #140

Merged
merged 5 commits into from
Oct 5, 2021
Merged

Add folder permissions backup #140

merged 5 commits into from
Oct 5, 2021

Conversation

jartigag
Copy link
Contributor

I wrote the get_folder_permissions and update_folder_permissions functions, and everything else to make the tool work with the Grafana Permissions API (also fix the "organaizations" typo).

I started from the fork commented in #90, so now I see restore.py may have diverged, specially in that restore_from_dir function.

¿How should I proceed?

@jartigag jartigag mentioned this pull request Jun 29, 2021
@acjohnson
Copy link
Collaborator

@jartigag can you rebase against master and ensure it works properly there? Why is the fork mentioned in #90 important to the folder permissions changes you are proposing?

@jartigag
Copy link
Contributor Author

I'll try the rebase against master.

The fork isn't relevant to the folder permissions changes, but I started from there and I saw that difference in restore.py when i opened this PR.

Let's see if I manage to make it right.

@acjohnson
Copy link
Collaborator

@jartigag let's give this one more re-base against master and we should be able to get it merged

@acjohnson acjohnson merged commit 37f7e58 into ysde:master Oct 5, 2021
@jartigag
Copy link
Contributor Author

Why it is unused?

@acjohnson
Copy link
Collaborator

Good question @jartigag you wrote it lol... If you aren't sure why it is there then I'll assume it was a mistake and delete. Thanks!

@jartigag
Copy link
Contributor Author

Sorry, what I've meant is I don't understand why you say it's unused.. I implemented it here https://github.com/naudit/grafana-backupper and I used it in production. I just wanted to merge it into the original tool too.

@acjohnson
Copy link
Collaborator

ok... but your fork has a function called restore_from_dir that doesn't mean this project should also have it as dead code... I don't see any correlation between your project grafana-backupper and this project other than you forked it... or am I missing something?

@acjohnson
Copy link
Collaborator

I think I see what you did, you meant to add 'folder_permissions': update_folder_permissions, to the restore_functions = collections.OrderedDict() but instead you created another dictionary inside of restore_from_dir which isn't being called anywhere... I'll see if I can combine the two

acjohnson pushed a commit to acjohnson/grafana-backup-tool that referenced this pull request Oct 15, 2021
@acjohnson
Copy link
Collaborator

af51467 solves this and the restore_from_dir function is now deleted

azman0101 pushed a commit to azman0101/grafana-backup-tool that referenced this pull request Jun 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants