-
Notifications
You must be signed in to change notification settings - Fork 106
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
(SIMP-4206) Added organization provider and updated datasource provider #86
Conversation
README.md
Outdated
##### `grafana_dashboard` | ||
#### `grafana_organization` | ||
|
||
In order to use the organization resource, add the followingto your manifest: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
followingto -> following to
@@ -0,0 +1,119 @@ | |||
# Copyright 2015 Mirantis, Inc. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2015?
# Copyright 2015 Mirantis, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is that actually needed? The whole project uses the Apache-2 license. We try to keep the header short and simple, and don't add the license text to all files.
Hi @heliocentric, thanks for the PR!
|
- Updated grafana datasource provider to allow datasources to be created on specific organizations - Added grafana organization provider to allow organizations to be created - Updated README to add more descriptive information for previous features as well as new Fixes commercial/enterprise-meta#91 SIMP-4206 #close
c6c5acd
to
bffadfd
Compare
@bastelfreak With the new push from @heliocentric I believe I've fixed all of your concerns.
Please let me know if there is anything else needed to complete this merge. |
Thanks, I will check the code later. I need to find out why travis isn't working for this PR. |
github UI isn't showing me any tests, but travis tells me it tested: |
@bastelfreak which rubocop issue are you referring to? The travis tests you linked are from the original request 4 days ago, doesn't look like they've been re-run. |
now travis is running again, let's see if it works |
@heliocentric @brandonrdn now we got issues :) |
Hey @bastelfreak, I fixed the failures with the spec tests, that was an issue on my end for testing before committing changes and thinking they passed. As of right now, all spec tests pass and rubocop has 0 issues. I'll be pushing up from my fork to the SIMP fork, so you should see the push soon. |
@bastelfreak The newest updates are pushed. You may need to restart Travis again. |
So close. I have the fix for the last few rubocop fails. It isn't telling me locally that it's broken. |
rubocop sitll isn't happy. Can you have a look? you can execute it locally with:
you can invoke the autofixmagic with:
you maybe need to install the gems, if you didn't do that:
|
@bastelfreak I'm not sure why it's doing this, but I did all 3 previously. I bundle installed, ran the rubocop check, auto_corrected what I could, and manually fixed the rest. When I pushed up my last changes rubocop showed 0 issues. Next push should work. Fingers crossed. |
now it looks good. Thanks for the work! |
on specific organizations
created
features as well as new
Fixes commercial/enterprise-meta#91
SIMP-4206 #close