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

Backend/develop #328

Merged
merged 56 commits into from
Apr 9, 2020
Merged

Backend/develop #328

merged 56 commits into from
Apr 9, 2020

Commits on Apr 3, 2020

  1. Add method to Grafana API to get an array of all dashboards. Useful f…

    …or testing going forward, and can also be used to refactor existing tests/code.
    daisycrego committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    f08e0fc View commit details
    Browse the repository at this point in the history
  2. Issue #225: When a GFCoonfig is created, dashboards are added for any…

    … existing events. Each dashboard will have panels for all existing sensors.
    daisycrego committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    7e22fc6 View commit details
    Browse the repository at this point in the history
  3. Issue #225: Tests for GFConfig - when a GFConfig is created, if there…

    … are no events then no dashboards are created on GF, if there is an event a dashboard is created on GF, if there is a sensor and event the sensor panel is added to the event dashboard.
    daisycrego committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    e055198 View commit details
    Browse the repository at this point in the history
  4. Getting in sync with frontend-team before merging in latest.

    Merge branch 'frontend-team' into grafana
    daisycrego committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    2ea3592 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Configuration menu
    Copy the full SHA
    c7889da View commit details
    Browse the repository at this point in the history
  2. Initial commit for #295: GF Config: View Existing Dashboards

    - Update ag_data.models.AGSensor to include a __str__ method - needed for display purposes.
    - Create a ModelForm to allow the user to select which sensors to include in a dashboard.
    - Change some names in the Grafana API for clarity
    - Modify Grafana.delete_all_panels (deleting by dashboard uid) to delete by dashboard name, because this will make the method more useful.
    - Add Grafana.update_dashboard_panels(), which takes a dashboard/event name and array of sensors and updates the Event dashboard on Grafana with the new set of sensors.
    - Add Grafana.get_all_sensors(), which returns a list of all current sensors in a given dashboard.
    - Update GFConfig GET view to return data for each dashboard to the context, as well as DashboardSensorPanelsForm forms initialized with the existing sensors.
    - Update gfconfig template to display a form for each dashboard listing all panels, with the panels actually present in the dashboard checked.
    - Add Update/Refresh/Delete buttons to sensor forms.
    daisycrego committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    828ddfc View commit details
    Browse the repository at this point in the history
  3. Issue #295: Add test of updated GFConfig view: If a dashboard exists,…

    … its name and sensor(s) are passed to the template and displayed.
    daisycrego committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    a1e2ede View commit details
    Browse the repository at this point in the history
  4. Issue #295: Improve test of GFConfig GET view to confirm that the cor…

    …rect ModelForm type was passed to the template.
    daisycrego committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    f8326cc View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Update GFConfig view to include link to Grafana for each event. Add m…

    …ethod to Grafana API to return dashboard url when passed a dashboard name. Pass urls in the context and display them in the template.
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    434495d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f8f33c View commit details
    Browse the repository at this point in the history
  3. Issue #295: Add update_dashboard function to GFConfig view - when upd…

    …ate button is pressed, dashboard is updated to include only the currently selected sensor panels.
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    e8b234a View commit details
    Browse the repository at this point in the history
  4. Fix issue with test_config_post_event_exists_dashboard_created which …

    …was failing on Travis builds only, not on local.
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    512cd2c View commit details
    Browse the repository at this point in the history
  5. Black and flake8.

    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    5728730 View commit details
    Browse the repository at this point in the history
  6. Issue #295: Add a CustomModelChoiceField class which extends ModelMul…

    …tipleChoiceField to provide labels for the sensors displayed by DashboardSensorPanelsForm. This is a better alternative to adding a __str__ method to the AGSensor model for processing form submissions. Remove __str__ method of ag_data.models.AGSensor. Add tests for Update Dashboard Panels to remove all panels, keep all panels, and keep only a subset of panels.
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    71c5213 View commit details
    Browse the repository at this point in the history
  7. Issue #295: Reset Dashboards view: Created a new view for handling da…

    …shboard resets. Add a test which sets the panels in the dashboard to a subset of the total panels, then uses reset to restore all panels to the dashboard.
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    abf52f4 View commit details
    Browse the repository at this point in the history
  8. Issue #295: Add delete dashboard feature to GFConfig Dashboards view.…

    … Add test of delete feature which deletes a dashboard and confirms delete operation returns True
    daisycrego committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    c094010 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #294 from gcivil-nyu-org/grafana

    Issue #225: Creating a GFConfig triggers creation of Event dashboards/Sensor panels for all existing events/sensors. Issue #295: View Existing Dashboards in GFConfig view
    sunnybansal committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    0ab2884 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Configuration menu
    Copy the full SHA
    0218feb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    170ba80 View commit details
    Browse the repository at this point in the history
  3. Export all events

    sunnybansal committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    d0325a2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b859922 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #312 from gcivil-nyu-org/events_export_all

    Export all events
    daisycrego committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    f200df4 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Merge pull request #320 from gcivil-nyu-org/backend-team

    Backend team
    alldne committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    d55d211 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Merge branch 'backend/develop' of https://github.com/gcivil-nyu-org/s…

    …pring2020-cs-gy-9223-class into backend/fetaure/measuerment_without_event
    VentusXu09 committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    9c46edd View commit details
    Browse the repository at this point in the history
  2. Get in sync with frontend-team.

    Merge branch 'frontend-team' of https://github.com/gcivil-nyu-org/spring2020-cs-gy-9223-class into frontend-team
    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    f3cdf88 View commit details
    Browse the repository at this point in the history
  3. Fix issue with reset/delete/update where actions intended for one GFC…

    …onfig instance were applied to another GFConfig instance (HTML form elements didn't all have distinct ids, so the wrong form elements were being seen in the reset/delete/update methods.
    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    0582542 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    47f0af8 View commit details
    Browse the repository at this point in the history
  5. Black and flake8.

    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    44ec773 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    75f760a View commit details
    Browse the repository at this point in the history
  7. Fix bug in grafana API that was causing tests to fail: syntax error w…

    …hen catching some exceptions.
    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    cd3310f View commit details
    Browse the repository at this point in the history
  8. Fix issue with test: current testing approach doesn't allow for destr…

    …uctive operations or operations that retrieve all dashboards from the current GFConfig because multiple tests are running in the same instance. This may be revised but for now the tests shouldn't use these kinds of methods.
    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    f7b879a View commit details
    Browse the repository at this point in the history
  9. Black.

    daisycrego committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    dc38e8d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    1342168 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. Configuration menu
    Copy the full SHA
    587e77e View commit details
    Browse the repository at this point in the history
  2. Update create_postgres_datasource to disable ssl when no password is …

    …provided for the datasource.
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    51de2e7 View commit details
    Browse the repository at this point in the history
  3. Merging

    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    dc77675 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cc24476 View commit details
    Browse the repository at this point in the history
  5. Printing some info to see on heroku logs (errors only occuring on her…

    …oku deployment, can't replicate on local to troubleshoot.
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    0009de3 View commit details
    Browse the repository at this point in the history
  6. Merge

    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    1711101 View commit details
    Browse the repository at this point in the history
  7. Printing some info to see on heroku logs (errors only occuring on her…

    …oku deployment, can't replicate on local to troubleshoot.
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    1765054 View commit details
    Browse the repository at this point in the history
  8. Printing some info to see on heroku logs (errors only occuring on her…

    …oku deployment, can't replicate on local to troubleshoot.
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    398df77 View commit details
    Browse the repository at this point in the history
  9. Printing some info to see on heroku logs (errors only occuring on her…

    …oku deployment, can't replicate on local to troubleshoot.
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    ceb40c0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d2a105a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    157e4cb View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    52b9ced View commit details
    Browse the repository at this point in the history
  13. Sync grafana with master

    .
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    c2c69e1 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #321 from gcivil-nyu-org/backend/feature/measureme…

    …nt_without_event
    
    Backend/feature/measurement without event
    alldne committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    4618901 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1a03fd2 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9e5eace View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    0726ff5 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    7fbeafc View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    90df65e View commit details
    Browse the repository at this point in the history
  20. Merge pull request #323 from gcivil-nyu-org/active_event_creation

    [WIP]Commit includes active event functionality
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    c04e8f7 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #324 from gcivil-nyu-org/frontend-team

    Frontend team
    daisycrego committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    78588df View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    8c619ca View commit details
    Browse the repository at this point in the history
  23. Merge pull request #325 from gcivil-nyu-org/backend/merge_master

    Backend/merge master
    alldne committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    420b5eb View commit details
    Browse the repository at this point in the history