Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
erin-noe-payne committed Nov 15, 2021
2 parents 034934a + a06f2f6 commit 15377ae
Show file tree
Hide file tree
Showing 31 changed files with 979 additions and 409 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ build/Release
node_modules/
jspm_packages/
dist/
dist/*
doitintl-bigquery-datasource/

# TypeScript v1 declaration files
Expand Down
69 changes: 41 additions & 28 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,61 @@
# Contributing
# Contributing Guide

Grafana uses GitHub to manage contributions.
Contributions take the form of pull requests that will be reviewed by the core team.
Thank you for taking the time to contribute! :tada::+1:

- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
The following is a set of guidelines for contributing to BigQuery Plugin for Grafana. These are guidelines, not rules, please use your best judgement and feel free to propose changes to this document in a pull request.

- If you have a trivial fix or improvement, go ahead and create a pull request.
---
:star: If you already here and love the project, please make sure to press the Star button. :star:

- If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/doitintl/bigquery-grafana/issues) or create a [new issue](https://github.com/doitintl/bigquery-grafana/issues/new/choose) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
---

## Steps to Contribute
## Table of Contents

Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
[How can I contribute?](#how-can-i-contribute)

Please check the [`beginner friendly`](https://github.com/doitintl/bigquery-grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/doitintl/bigquery-grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
- [Reporting Bugs](#reporting-bugs)
- [Suggesting Enhancements / Feature Requests](#suggesting-enhancements--feature-requests)
- [Pull Requests](#pull-requests)
- [Documentation](#documentation)
- Design?

## Pull Request Checklist
[Additional Notes](#additional-notes)

- Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.
- [Release Method](#release-method)
- [Code of Conduct](#code-of-conduct)

- If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
## How can I contribute?

- Add tests relevant to the fixed bug or new feature.
### Reporting Bugs

### Pull requests with new features
When creating a new bug report, please make sure to:

Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
- Search for existing issues first. If you find a previous report of your issue, please update the existing issue with additional information instead of creating a new one.
- If you still decide to open an issue, please review the template and guidelines and include as much details as possible.

Make sure to include `Closes #<issue number>` or `Fixes #<issue number>` in the pull request description.
### Suggesting Enhancements / Feature Requests

### Pull requests with bug fixes
If you would like to suggest an enhancement or ask for a new feature:

Please make all changes in one commit if possible. Include `Closes #<issue number>` in bottom of the commit message.
A commit message for a bug fix should look something like this.
- Please check [the forum](https://feedback.doit-intl.com/forums/933776-grafana-bigquery-plugin) for existing threads about what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
- If there is no open thread, you're welcome to start one to have a discussion about what you want to suggest. Try to provide as much details and context as possible and include information about *the problem you want to solve* rather only *your proposed solution*.

```
avoid infinite loop in the dashboard provisioner
### Pull Requests

if one dashboard with an uid is refered to by two
provsioners each provisioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.
- **Code contributions are welcomed**. For big changes or significant features, it's usually better to reach out first and discuss what you want to implement and how (we recommend reading: [Pull Request First](https://medium.com/practical-blend/pull-request-first-f6bb667a9b6#.ozlqxvj36)). This to make sure that what you want to implement is aligned with our goals for the project and that no one else is already working on it.
- Include screenshots and animated GIFs in your pull request whenever possible.
- Please add [documentation](#documentation) for new features or changes in functionality along with the code.

### Documentation

Closes #12864
```
The project's documentation can be found at [https://github.com/doitintl/bigquery-grafana/blob/master/README.md). To contribute edits, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.

If the pull request needs changes before its merged the new commits should be rebased into one commit before its merged.
## Additional Notes

### Release Method

We publish a stable release every ~3-4 months, although the goal is to get to a stable release every month.

## Code of Conduct

This project adheres to the Contributor Covenant [code of conduct](https://github.com/doitintl/bigquery-grafana/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected]
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Install from [grafana.net](https://grafana.net/plugins/doitintl-bigquery-datasou
Use the [grafana-cli](http://docs.grafana.org/plugins/installation/#installing-plugins-manually)

```bash
grafana-cli --pluginUrl https://github.com/doitintl/bigquery-grafana/archive/1.0.8.zip plugins install doitintl-bigquery-datasource
grafana-cli --pluginUrl https://github.com/doitintl/bigquery-grafana/archive/2.0.2.zip plugins install doitintl-bigquery-datasource
```

## Copy files
Expand All @@ -27,7 +27,7 @@ Add the below to your values.yaml
## Pass the plugins you want installed as a list.
##
plugins:
- https://github.com/doitintl/bigquery-grafana/archive/2.0.0.zip;doit-bigquery-datasource
- https://github.com/doitintl/bigquery-grafana/archive/2.0.2.zip;doit-bigquery-datasource
grafana.ini:
plugins:
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
[![GitHub stars](https://img.shields.io/github/stars/doitintl/bigquery-grafana.svg?style=svg)](https://github.com/doitintl/bigquery-grafana/stargazers)
![GitHub forks](https://img.shields.io/github/forks/doitintl/bigquery-grafana.svg?style=svg)
[![Circle CI](https://circleci.com/gh/doitintl/bigquery-grafana.svg?style=svg)](https://circleci.com/gh/doitintl/bigquery-grafana)
[![Code Climate](https://codeclimate.com/github/doitintl/bigquery-grafana/badges/gpa.svg)](https://codeclimate.com/github/doitintl/bigquery-grafana/coverage)
[![Issue Count](https://codeclimate.com/github/doitintl/bigquery-grafana/badges/issue_count.svg)](https://codeclimate.com/github/doitintl/bigquery-grafana)
[![CodeCpv](https://codecov.io/gh/doitintl/bigquery-grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/doitintl/bigquery-grafana/)
[![Automated Release Notes by gren](https://img.shields.io/badge/%F0%9F%A4%96-release%20notes-00B2EE.svg)](https://github-tools.github.io/github-release-notes/)

## Status: Production Ready
Expand Down
4 changes: 0 additions & 4 deletions dist/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
[![GitHub stars](https://img.shields.io/github/stars/doitintl/bigquery-grafana.svg?style=svg)](https://github.com/doitintl/bigquery-grafana/stargazers)
![GitHub forks](https://img.shields.io/github/forks/doitintl/bigquery-grafana.svg?style=svg)
[![Circle CI](https://circleci.com/gh/doitintl/bigquery-grafana.svg?style=svg)](https://circleci.com/gh/doitintl/bigquery-grafana)
[![Code Climate](https://codeclimate.com/github/doitintl/bigquery-grafana/badges/gpa.svg)](https://codeclimate.com/github/doitintl/bigquery-grafana/coverage)
[![Issue Count](https://codeclimate.com/github/doitintl/bigquery-grafana/badges/issue_count.svg)](https://codeclimate.com/github/doitintl/bigquery-grafana)
[![CodeCpv](https://codecov.io/gh/doitintl/bigquery-grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/doitintl/bigquery-grafana/)
[![Automated Release Notes by gren](https://img.shields.io/badge/%F0%9F%A4%96-release%20notes-00B2EE.svg)](https://github-tools.github.io/github-release-notes/)

## Status: Production Ready
Expand Down
Binary file modified dist/doitintl-bigquery-datasource_darwin_amd64
Binary file not shown.
Binary file modified dist/doitintl-bigquery-datasource_linux_amd64
Binary file not shown.
Binary file modified dist/doitintl-bigquery-datasource_windows_amd64.exe
100644 → 100755
Binary file not shown.
276 changes: 138 additions & 138 deletions dist/module.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/module.js.map

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions dist/partials/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h5>Uploading a Service Account Key File</h5>
visualize data from multiple GCP Projects then you need to create one datasource per GCP Project.
</p>
<p>
The <strong>BigQuery Data Viewer</strong> role provides all the permissions that Grafana needs. The following API
The <strong>BigQuery Data Viewer</strong> role and the <strong>Job User</strong> role provides all the permissions that Grafana needs. The following API
needs to be enabled on GCP for the datasource to work: <a class="external-link" target="_blank" href="https://console.cloud.google.com/apis/library/bigquery.googleapis.com">BigQuery
API</a>
</p>
Expand Down Expand Up @@ -125,11 +125,6 @@ <h6>Uploaded Key Details</h6>
ng-change="ctrl.refresh()"></select>
</div>
</div>
<gf-form-switch class="gf-form" label="Send anonymous usage data" label-class="width-13" checked="ctrl.current.jsonData.sendUsageData" switch-class="max-width-6"></gf-form-switch>
<!-- <label class="gf-form-label query-keyword pointer">
</label> -->



<p class="gf-form-label" ng-show="ctrl.current.jsonData.authenticationType !== ctrl.defaultAuthenticationType"><i class="fa fa-save"></i>
Verify GCE default service account by clicking Save & Test</p>
9 changes: 8 additions & 1 deletion dist/partials/query.editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,28 @@
<datalist id="locationList">
<option value=US>United States (US)</option>
<option value=EU>European Union (EU)</option>
<option value=us-west1>Oregon (us-west1)</option>
<option value=us-west2>Los Angeles (us-west2)</option>
<option value=northamerica-northeast1>Montréal (northamerica-northeast1)</option>
<option value=us-west3>Salt Lake City (us-west3)</option>
<option value=us-west4>Las Vegas (us-west4)</option>
<option value=us-central1>Iowa (us-central1)</option>
<option value=us-east1>South Carolina (us-east1)</option>
<option value=us-east4>Northern Virginia (us-east4)</option>
<option value=northamerica-northeast1>Montréal (northamerica-northeast1)</option>
<option value=southamerica-east1>São Paulo (southamerica-east1)</option>
<option value=europe-north1>Finland (europe-north1)</option>
<option value=europe-west1>Belgium (europe-west1)</option>
<option value=europe-west2>London (europe-west2)</option>
<option value=europe-west3>Frankfurt (europe-west3)</option>
<option value=europe-west4>Netherlands (europe-west4)</option>
<option value=europe-west6>Zürich (europe-west6)</option>
<option value=asia-east2>Hong Kong (asia-east2)</option>
<option value=asia-south1>Mumbai (asia-south1)</option>
<option value=asia-northeast2>Osaka (asia-northeast2)</option>
<option value=asia-east1>Taiwan (asia-east1)</option>
<option value=asia-northeast1>Tokyo (asia-northeast1)</option>
<option value=asia-southeast1>Singapore (asia-southeast1)</option>
<option value=asia-southeast2>Jakarta (asia-southeast2)</option>
<option value=australia-southeast1>Sydney (australia-southeast1)</option>
<option value=asia-northeast3>Seoul (asia-northeast3)</option>
</datalist>
Expand Down
7 changes: 3 additions & 4 deletions dist/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"backend": true,
"executable": "doitintl-bigquery-datasource",
"dependencies": {
"grafanaDependency": "7.x.x"
"grafanaDependency": "7.x || 8.x"
},
"queryOptions": {
"maxDataPoints": true
Expand All @@ -30,9 +30,8 @@
{ "name": "GitHub", "url": "https://github.com/doitintl/bigquery-grafana" },
{ "name": "MIT License", "url": "https://github.com/doitintl/bigquery-grafana/blob/master/LICENSE.md" }
],
"updated": "2020-12-16",
"screenshots": [{"name": "Query builder", "path":"https://raw.githubusercontent.com/doitintl/bigquery-grafana/master/img/QueryBuilder.png"}],
"version": "2.0.1"
"updated": "2021-06-29",
"version": "2.0.2"
},
"routes": [
{
Expand Down
Binary file removed doitintl-bigquery-datasource-2.0.1.zip
Binary file not shown.
21 changes: 5 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
//module github.com/repo/module
module github.com/grafana/simple-datasource-backend

go 1.14
go 1.16

require (
cloud.google.com/go v0.58.0 // indirect
cloud.google.com/go/bigquery v1.8.0
github.com/bitly/go-simplejson v0.5.0
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/go-delve/delve v1.4.1 // indirect
github.com/googleapis/gax-go v1.0.3 // indirect
github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4
github.com/golang/protobuf v1.4.2 // indirect
github.com/grafana/grafana-plugin-sdk-go v0.67.0
github.com/hashicorp/go-hclog v0.9.2
github.com/hashicorp/go-plugin v1.2.2
github.com/kr/pretty v0.1.0 // indirect
golang.org/x/net v0.0.0-20200602114024-627f9648deb9
golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
golang.org/x/tools v0.0.0-20200612220849-54c614fe050c // indirect
//golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
google.golang.org/api v0.26.0
google.golang.org/genproto v0.0.0-20200612171551-7676ae05be11 // indirect
github.com/hashicorp/go-hclog v0.9.2 // indirect
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
google.golang.org/api v0.30.0
)
Loading

0 comments on commit 15377ae

Please sign in to comment.