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.

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

Jump to bottom

Grafana #333

Merged
merged 10 commits into from
Apr 9, 2020
Merged

Grafana #333

merged 10 commits into from
Apr 9, 2020

Commits on Apr 9, 2020

  1. Merge pull request #324 from gcivil-nyu-org/frontend-team 

    Frontend team
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    78588df View commit details
    Browse the repository at this point in the history

  2. Merge pull request #327 from gcivil-nyu-org/frontend-team 

    Frontend team
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    d6c06a1 View commit details
    Browse the repository at this point in the history

  3. Changing order of Grafana API invocations in gf_config view so that d… 

    …atasource is configured BEFORE grafana dashboard(s) are created. This is why the datasource isn't being set up properly.
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    c9fb656 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://git.heroku.com/sextants-telemetry in… 

    …to grafana
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    673c522 View commit details
    Browse the repository at this point in the history

  5. One more change to fix datasource issue: order of grafana api incovat… 

    …ions.
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    fec46f2 View commit details
    Browse the repository at this point in the history

  6. Fix gf_config post method so that it returns all necessary context wh… 

    …en the page reloads - was missing some of the config data.
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    e5ba27a View commit details
    Browse the repository at this point in the history

  7. Change create_postgres_datasource() method to give the datasource the… 

    … name of the current postgres db (was being set to 'Datasource') so that add_panel will correctly associate the new panels with the datasource.
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    90c5383 View commit details
    Browse the repository at this point in the history

  8. Revert last change.

    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    9fbe811 View commit details
    Browse the repository at this point in the history

  9. Revert last change.

    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    09c87d7 View commit details
    Browse the repository at this point in the history

  10. Change name of test in ag_data.simulator because it is failing. Backe… 

    …nd has a PR coming.
    @daisycrego
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    41668db View commit details
    Browse the repository at this point in the history