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

Merging views engine #439

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Merging views engine #439

wants to merge 34 commits into from

Commits on Jul 2, 2014

  1. Add: views engine 

    The files contained in status/custom_*.py and status/templates/custom_*
pemit to have a views engine, i.e. a customised form in where you can choose
the data you need from Livestatus datasources/columns, arrange them how
you like (sorting, filtering, stats) and feed this data to pre-defined
templates or your own ones. The views can be represented with simple
dictionaries, and are therefore stored through the userdata module.

User-defined customised views are now possible within Adagios :)
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    a8b49c5 View commit details
    Browse the repository at this point in the history

  2. Add: javascript libraries 

    * datatable: jquery plugin to render html tables into
  pageable/sortable/filterable tables. Simpler and more
  functional than datatables.

* jquery-ui: contains the functions which permit DOM elements
  to me draggable. This is used in custom forms, where the user
  can re-order the colums, filters, etc.
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    5a77a91 View commit details
    Browse the repository at this point in the history

  3. Add: template for custom views: pie chart 

    This templates, through the help of jqplot, can display a pie chart
representing data coming from aggregated Livestatus queries (with
the "Stats:" clause).
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    b168326 View commit details
    Browse the repository at this point in the history

  4. Add: template "maps" for custom views 

    Through OpenLayers.js, displays a map with red/green markers representing
the state of all defined hosts.
The IP addresses are mapped to GPS coordianates through GeoIP.
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    8330ff1 View commit details
    Browse the repository at this point in the history

  5. Add: filter default form: "regex" and "negate" options

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    0f8b188 View commit details
    Browse the repository at this point in the history

  6. add: auto-reload of form when a filter column is modified

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    05db7d0 View commit details
    Browse the repository at this point in the history

  7. fix: binding events to <select>s when they are dynamically added

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    e15a95a View commit details
    Browse the repository at this point in the history

  8. fix: CSS conflict between bootstrap and openlayers

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    878c8eb View commit details
    Browse the repository at this point in the history

  9. fix: travis installation of python packages

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    f0df4a2 View commit details
    Browse the repository at this point in the history

  10. status/custom_view: Fix broken livestatus query 

    This patch fixes an issue where custom_view cannot be
loaded because an extra linebreak is sent with the
livestatus query.

I am guessing shinken's implementation of livestatus
does not care about this.
    @matthieucan
    Pall Sigurdsson authored and matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    35038fc View commit details
    Browse the repository at this point in the history

  11. status/custom_view now more testable 

    If livestatus queries fail, return 500 error

This should make unit testing of the view easier.
    @matthieucan
    Pall Sigurdsson authored and matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    6742a1a View commit details
    Browse the repository at this point in the history

  12. remove openlayers.js and geolocalisation functions

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    eef0519 View commit details
    Browse the repository at this point in the history

  13. remove style=color: black fro html code

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    f213c65 View commit details
    Browse the repository at this point in the history

  14. move style from html to css

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    baa61e4 View commit details
    Browse the repository at this point in the history

  15. Add: ability to have customised views rendered full screen 

    This is cool for wall projection (and for the future dashboard.

Conflicts:
	adagios/status/templates/custom_views/templates/maps.html
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    71eab42 View commit details
    Browse the repository at this point in the history

  16. Add: 'edit' icons next to view names in the left menu 

    The 'delete view' button is now on the edit page, rather than the
view page.
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    600e96e View commit details
    Browse the repository at this point in the history

  17. Add: search box on table.html template, which filters data

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    a9b1131 View commit details
    Browse the repository at this point in the history

  18. fix: small bug in 'state' widget, datasource->data_source

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    ff46028 View commit details
    Browse the repository at this point in the history

  19. fix: error when no backend is working

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    11e792a View commit details
    Browse the repository at this point in the history

  20. move css from html to css (again)

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    9513dd0 View commit details
    Browse the repository at this point in the history

  21. move Custom views submenu in to Experimental 

    Conflicts:
	adagios/templates/base.html
    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    64a2d88 View commit details
    Browse the repository at this point in the history

  22. replace elif by else/if, to stay compatible with django 1.3

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    cbff314 View commit details
    Browse the repository at this point in the history

  23. fix: typo

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    de82aab View commit details
    Browse the repository at this point in the history

  24. remove jquery-ui files, keep .min.js only

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    e49d0e6 View commit details
    Browse the repository at this point in the history

  25. remove jqplots docs/ and examples/

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    3882b42 View commit details
    Browse the repository at this point in the history

  26. remove useless jqplot files

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    6090066 View commit details
    Browse the repository at this point in the history

  27. remove not minified datatable files

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    bdeae29 View commit details
    Browse the repository at this point in the history

  28. remove license, the readme is explicit enough

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    4512fa6 View commit details
    Browse the repository at this point in the history

  29. reput jqplot's readme

    @matthieucan
    matthieucan committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    a2f4449 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2014

  1. status.views: move specific code into custom_utils.py

    @matthieucan
    matthieucan committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    583accf View commit details
    Browse the repository at this point in the history

  2. status.views.custom_edit: move specific code into custom_forms.py

    @matthieucan
    matthieucan committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    e4a3ea6 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. Merge remote-tracking branch 'origin/master' into mcanneil 

    Conflicts:
	adagios/templates/base.html
    @titilambert
    titilambert committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    ae546a8 View commit details
    Browse the repository at this point in the history

  2. Fix link_host widget

    @titilambert
    titilambert committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    98bdc93 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2014

  1. Fix django 1.4 support

    @titilambert
    titilambert committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    de69951 View commit details
    Browse the repository at this point in the history