-
Notifications
You must be signed in to change notification settings - Fork 74
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
Selenium tests #441
Selenium tests #441
Conversation
django.test.LiveServerTestCase errors out if STATIC_URL is not defined in settings.
Adds tests using selenium and actual browsers using webdriver. TEST_SPLINTER environment variable enables this type of testing. Test cases added: /status - check that Status Overview, Network Parents returns a number. /status/services - clicks multi select box and selects all services. Confirms that all services are selected.
Nice :) |
Is there a way to get these tests up and running inside travis ? I worry otherwise these tests get merged in, and then never used. Failing that, can we make a service on status.adagios.org that tests against git master ? |
One caveat, it doesn't work for pull requests. At least not for PRs not originating from the upstream repo, http://docs.travis-ci.com/user/sauce-connect/ (first paragraph) and http://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests. It has to do with exposing the secure variables. |
Well if there is nothing we can do about it... Then so be it :) Having master branch tested is better than nothing.
|
As a workaround external PRs can be manually merged into new branches locally which are then pushed and tested as "upstream branches". A bit of work but might prove helpful for PRs deemed potentially dangerous, the PR submitter can then add patches to the new upstream branch if needed. |
Hello ! |
@tomas-edwardsson can you add a selenium test that covers the problem discovered in #440 and #433 ? |
SeleniumTestCase can be used by many components withing adagios and should not live within status/
This completely closes webdriver
@palli added objectbrowser tests and integrated with Saucelabs, https://saucelabs.com/u/tommi |
@tomas-edwardsson nice job ! |
This is really useful. Just a quick question. Does this test return a false green if we fix #433 in such a way that the objectbrowser window shows errors instead of hanging when there is a problem ? (i.e. should the test look for 'localhost' or something similar in the host table) |
The test counts rows in the host-table tbody. If we setup a error handler we will not add a row to the host-table containing the error but a div similar to the one that shows Loading. Therefore it should flag as failed. Here is the output after I intentionally broke adagios.js
Breakage
|
Ok merging this as is. If the test case handles errors, then you should consider renaming the error message (current error message indicates that a timeout occured) |
Which is correct, it is a timeout error. When loading asynchronous content, I put in a wait for load. If the code is slow or does not load the asynchronous content at all, it is a timeout error. |
I think its a stretch to talk about a timeout error in cases where you have asynchronous call with no error callbacks. Just think of the use case when this test breaks, and a helpful developers wants to see why the test is broken. Will the troubleshooter be looking at why the backend is serving errors, or will he be trying to profile backend use cases and/or retrying the unit tests with higher timeouts in the hopes that this was a fluke/slowness, in Travis ? |
|
||
@classmethod | ||
def setUpClass(cls): | ||
global SELENIUM_DRIVER |
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.
Can we do this without having a global variable ?
commit 39b6666cd253f44a6ae1c98d44f8586aed85ca9d Merge: 44e6765 d37ba3b Author: hakong <[email protected]> Date: Mon Feb 8 01:25:22 2016 +0000 Merge pull request #550 from opinkerfi/nagios-daemon-interface Nagios process interaction through adagios.daemon commit 44e6765d6d90ed7738c183c2ce092bd460748cf5 Author: hakong <[email protected]> Date: Mon Feb 8 00:48:38 2016 +0000 Update adagios.spec commit 11b77fe53339810587d47c9e2ad61a454830031d Author: hakong <[email protected]> Date: Mon Feb 8 00:48:32 2016 +0000 Update Makefile commit ed5382c1efb62f4644ba406d381ca0827300eed9 Author: hakong <[email protected]> Date: Mon Feb 8 00:48:27 2016 +0000 Update adagios commit 43105c2771f4242488e86583bc4558d8de22a2ec Author: hakong <[email protected]> Date: Mon Feb 8 00:48:23 2016 +0000 Update __init__.py commit b8bdedf43e8122e812806bbfe06ecd13b3484b1f Author: hakong <[email protected]> Date: Sun Feb 7 23:05:39 2016 +0000 Update adagios.spec commit 66d7bdbce073d16ea62d9794aec94bd90f0bbe04 Author: hakong <[email protected]> Date: Sun Feb 7 23:05:37 2016 +0000 Update Makefile commit 001fc6fc3e23801f4915450f4a88c84ab195532c Author: hakong <[email protected]> Date: Sun Feb 7 23:05:36 2016 +0000 Update adagios commit ee0a2bb932b5d6248a5a7c7e9d6e37f794c53395 Author: hakong <[email protected]> Date: Sun Feb 7 23:05:35 2016 +0000 Update __init__.py commit 04cfc6bcbba6176e24564b43dc5547febddec011 Merge: 0c1dd0b 5adf49a Author: Pall Sigurdsson <[email protected]> Date: Sat Aug 15 18:50:15 2015 +0200 Merge pull request #577 from opinkerfi/status_hosts_with_no_services Fix hosts with no services appearing as down. commit 5adf49a9677f3b10f3f735c277eb0978001e0356 Author: Pall Sigurdsson <[email protected]> Date: Sat Aug 15 18:34:47 2015 +0200 Fix hosts with no services appearing as down. Fixes #570 commit 0c1dd0be210faa1aaeee2c3ac6d77b76dbf0a9cc Author: Pall Sigurdsson <[email protected]> Date: Sat Aug 15 17:35:16 2015 +0200 Properly handle unicode text when sending email. commit 940fd3f4c0b2cf1ef4d5cabf0fc69dcd173ce185 Merge: 83a1e2a 3bf68af Author: Pall Sigurdsson <[email protected]> Date: Fri May 1 12:38:05 2015 +0200 Merge pull request #556 from AccelerationNet/include-normalization Centralize reload_configfile code in settings commit 3bf68af9c3d54205ce1f05cb63f50aa823bdd3f2 Author: Nathan Bird <[email protected]> Date: Mon Apr 13 12:55:52 2015 -0400 Centralize reload_configfile code in settings Reading the config file `adagios.conf` into the adagios.settings dictionary is slightly tricky (need to also process `include` statement). Centralize this code in a function in `settings.py` and call that function several times. This should solve #555. commit d37ba3b3bd81dbd75502eaaf189a055d2a8d2547 Author: Tomas Edwardsson <[email protected]> Date: Wed Apr 8 00:05:47 2015 +0000 Better sudoers fail documentation commit 8d6181ecab90e19e44cdb90acf380fda4ed5ad20 Author: Tomas Edwardsson <[email protected]> Date: Tue Apr 7 23:57:58 2015 +0000 Default to using nagios_service commit db9cb28ca098553bcd3c2c42ce1c0fd4a63a06e9 Author: Tomas Edwardsson <[email protected]> Date: Tue Apr 7 19:43:04 2015 +0000 Enable editing nagios_service within adagios commit 83a1e2a4e9f34d58c634eb40d0da14e70cf8db5d Merge: fc57957 b6e5d8e Author: Pall Sigurdsson <[email protected]> Date: Tue Apr 7 15:21:57 2015 -0400 Merge pull request #552 from opinkerfi/django-rpm-deps Default to python-django when building rpm commit b6e5d8ef5782d8d21a8f02dd71e437df87326049 Author: Tomas Edwardsson <[email protected]> Date: Tue Apr 7 19:17:58 2015 +0000 RPM linting commit be88c772e936d49bef2d1a0a53c470c5ad54aac3 Author: Tomas Edwardsson <[email protected]> Date: Tue Apr 7 19:03:21 2015 +0000 Default to python-django, special case for rhel6 Making python-django the default should be more sane than setting specific version for each new distribution version. Only left the case for rhel6. commit 9494561fd4b894296a9fe229ab78dd2ab398a475 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 21:08:14 2015 +0000 Better error detection for sudoers problems Since we are running "sudo -n" we get a error right away with unconfigured sudoers. Detect "sudo:" on stderr and show the sudoers hints. commit b3095bf90bc3d756d2f7a195672ce37dd008e72e Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 20:37:51 2015 +0000 Remove empty line with spaces commit cd374c2049cec624aa898ff80e4f9a34e669dc43 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 20:36:00 2015 +0000 Remove old un-used class ADaemon commit 24c42c1caa509492bf9590574f0a373b74f2bc21 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 20:33:26 2015 +0000 Remove unused variables commit fc5795744cedad91e7c71dc4efd1751c86634ec2 Merge: d80edc0 059751d Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 17:42:21 2015 +0000 Merge pull request #549 from opinkerfi/fake-environment-refactor Refactor calls to FakeAdagiosEnvironment() commit d80edc09c57511863406d5b03a968407b7314605 Merge: e00710e 7bbae3d Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 17:37:06 2015 +0000 Merge pull request #548 from opinkerfi/fix-add-object-form objectbrowser/add: Include data from all fields commit 059751de42ad74d07b84c9d2c8468d907c468bb4 Author: Pall Sigurdsson <[email protected]> Date: Sat Apr 4 18:24:10 2015 +0200 Refactor calls to FakeAdagiosEnvironment() Create a convenience function get_test_environment() which updates all globals and returns a function FakeAdagiosEnvironment. commit e00710e21b9ec51928c7c9d5edf3d94799dcd663 Merge: 835a30c 0007cde Author: Pall Sigurdsson <[email protected]> Date: Sat Apr 4 18:12:53 2015 +0200 Merge pull request #544 from opinkerfi/reschedule-fix-int-exception Fix converting None to int commit 835a30c37216599122e6a37fb17d61c502c1f729 Merge: 41ba567 3197f20 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 16:11:00 2015 +0000 Merge pull request #547 from opinkerfi/fix-rest-unittests rest/tests.py: Run unit-tests in isolation. commit 7bbae3d8a1a68ae72972f74e725bf8468b687697 Author: Pall Sigurdsson <[email protected]> Date: Sat Apr 4 17:58:47 2015 +0200 objectbrowser/add: Include data from all fields Fixes an issue where new object was created and fields that were left at default values during add object phase are not included in the object. Fixes #527 commit 3197f20fe11ce877211be13d737f87d2ad9821bc Author: Pall Sigurdsson <[email protected]> Date: Sat Apr 4 17:57:26 2015 +0200 rest/tests.py: Run unit-tests in isolation. Make sure unit tests are not relying on global nagios configuration on the machine running the tests. commit 8f8ddefea21beea7888faaad1f5562c4ab7e84c9 Merge: 663db55 41ba567 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 15:36:11 2015 +0000 Merge branch 'master' into nagios-daemon-interface commit 0007cdeac02cde1d6066a190562b0db894b3eb28 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 14:20:52 2015 +0000 Add unit tests for rest reschedule calls commit f89fd686119822f61c5b3961aa73b2be6bc7cf87 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 14:09:13 2015 +0000 Add mock as a requirement for development commit 1bc67b588b4eab12973fecc70d02941a4145ee44 Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 13:37:37 2015 +0000 Always do int conversion on check_time Allow it to raise exception on invalid arguments. commit ffc927b41c40cb54454aa4874e00d74b0094436d Author: Tomas Edwardsson <[email protected]> Date: Sat Apr 4 13:35:15 2015 +0000 Remove unnecessary int conversion reschedule which is called by reschedule_many already does this conversion, removing. commit 41ba56791f7c806cdb51c0ecedb9805d55e1fda0 Merge: dfbc554 672cd38 Author: Pall Sigurdsson <[email protected]> Date: Fri Apr 3 23:05:36 2015 +0200 Merge pull request #545 from opinkerfi/url-consistency-and-bi-urls-autoenabled Consistency of urls.py and enable bi.urls commit dfbc5547f6402a54a9f66a943969711c3c8e3e1f Merge: 8ddf305 9e0b6de Author: Pall Sigurdsson <[email protected]> Date: Fri Apr 3 22:51:13 2015 +0200 Merge pull request #543 from opinkerfi/fix-rest-content-type Replace obsolete mimetype with content_type commit 672cd38b750e1512c14552f44e50bd9f7f1f5c52 Author: Tomas Edwardsson <[email protected]> Date: Fri Apr 3 18:41:11 2015 +0000 Use url() in urls.py and remove settings The use of url() was really inconsistent between urls.py files, made all of them use the same syntax. Also removed the import of adagios.settings where not needed. commit 6fb4c34b5fa02743fc1550acd34e1973f5a2b565 Author: Tomas Edwardsson <[email protected]> Date: Fri Apr 3 18:38:09 2015 +0000 Enable bi.urls by default Is throwing template errors on '{% url "bi.views.index" %}' from base.html at least under gunicorn. I don't see a good reason for not enabling this. commit 89b44fd6e89d7a365ee521927d2c8802c3b8c785 Author: Tomas Edwardsson <[email protected]> Date: Fri Apr 3 17:32:11 2015 +0000 Fix converting None to int Now only to coerces to int if check_time is a float. commit 9e0b6de91e99004adbdb4a418ba6a524b97367f9 Author: Tomas Edwardsson <[email protected]> Date: Fri Apr 3 16:14:53 2015 +0000 Replace obsolete mimetype with content_type HttpResponse in Django 1.7 no longer supports the mimetype argument and uses content_type instead. Django 1.4 and later also support content_type so this should have no effect. commit 8ddf30577e3052ccb5ab99b0911e6704ffb23e21 Merge: 78edb40 ffebe05 Author: Pall Sigurdsson <[email protected]> Date: Thu Mar 26 00:19:45 2015 +0100 Merge pull request #536 from opinkerfi/fix-missing-description-on-copy Fix missing description on copy commit 78edb40df1683956350c07f8b89056882b6a87fe Merge: ead37ef 3c40490 Author: Pall Sigurdsson <[email protected]> Date: Thu Mar 26 00:19:39 2015 +0100 Merge pull request #537 from opinkerfi/fix-advanced-search-input-box Fix advanced search escaping search text commit ead37efec41e2988dcd9862e17e4372b9b77504d Author: Pall Sigurdsson <[email protected]> Date: Tue Mar 24 21:25:06 2015 +0100 Fix travis and lack of adagios.conf commit 3c40490a41f49e20e60b224e266eb60137c3cbe6 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 21 21:56:05 2015 +0100 Fix advanced search escaping search text Fixes #520 commit ffebe05e84ba48fbd3aeb46608ba5900a22c4bfd Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 21 21:33:58 2015 +0100 Revert "Travis: Explicitly copy adagios.conf" This reverts commit 1086b36f24f7dd9d1d82044b9ba47a604d78d9a0. commit bc92cb5ba692c44a858b7b150254faed6676ef02 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 21 21:31:59 2015 +0100 Fix missing description of copied objects Fixes #534 commit 1086b36f24f7dd9d1d82044b9ba47a604d78d9a0 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 21 21:25:59 2015 +0100 Travis: Explicitly copy adagios.conf commit 9a7a311bffe6aa2a76494ce9d898d58acb6df873 Merge: b398339 1fada52 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 21 17:10:08 2015 +0100 Merge pull request #535 from starvingprogrammer/master Updated rest.py reschedule method to use an integer time instead of decimal commit 1fada523162b21640e9ab006bf8b5920e7ec9c99 Author: starvingprogrammer <[email protected]> Date: Fri Mar 20 15:14:58 2015 -0400 Update rest.py In Naemon 0.9.1 the service recheck option fails without error. It says the command is sent successfully, but naemon.log shows the following: Parse error: Invalid characters (.78) in ulong '1426878227.78' The Nagios example (http://old.nagios.org/developerinfo/externalcommands/commandinfo.php?command_id=129) shows the use of `date +%s` to populate the time, which is an integer, so decimal is not likely expected. Although Nagios 3.5.1 seems to be okay with this, Naemon does strong type checking and rejects it. commit b3983392d2a15ef91ad7ff84e5c8e405bafc08a6 Merge: 32f0221 1343c58 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 14 17:12:34 2015 +0100 Merge pull request #513 from ratchetnclank/patch-1 Update bulk_edit.html commit 32f0221a75ac727d8f6546c61abacbab429192a9 Merge: ae7bd56 c7ce906 Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 14 17:12:18 2015 +0100 Merge pull request #524 from hakong/patch-5 Changed misleading error message commit ae7bd566a9a2c094c2b5efef9f46abbca6dae4c1 Merge: 2255641 c798aab Author: Pall Sigurdsson <[email protected]> Date: Sat Mar 14 17:11:51 2015 +0100 Merge pull request #533 from mayasd/master Handle IOError exception when object is saved commit c798aab8f38651fa84775db312a114d34687592b Author: Tim Clerc <[email protected]> Date: Thu Mar 12 20:30:06 2015 +0100 Fix status view snippets_log : missing parameter commit 7768fd71df1055115e09323302a102a63349ee8d Author: root <root@shinken> Date: Thu Mar 5 21:13:38 2015 +0100 Handle IOError exception when object is saved commit 8eef48b97eeb65d4df3e91a3f06dc299d3de34ec Author: Tim CLERC <[email protected]> Date: Thu Mar 5 08:16:28 2015 +0100 Handle IOError exception when object is saved commit c7ce906ef6483ad52cf2755d1aa14878b6dd3f1c Author: hakong <[email protected]> Date: Fri Feb 13 13:35:47 2015 +0000 Changed misleading error message commit 225564170a828bcb51ca0f7238cf5d0feb863b0a Author: Pall Sigurdsson <[email protected]> Date: Sun Jan 25 22:31:26 2015 +0100 Fix status/dashboard/ showing wrong data Fixes #518 commit 1343c58d2f3a2ffa9f2f3e609c085401174e198b Author: Daryl Bizsley <[email protected]> Date: Fri Jan 2 15:42:05 2015 +0000 Update bulk_edit.html Fix typo commit a9f84196bdd02d623e291c0c9c964d1905ecb0e7 Author: Pall Sigurdsson <[email protected]> Date: Fri Dec 26 15:03:41 2014 +0100 Mail objectlists should link to problems page Before this patch every time a user would send mail regarding specific objects, there would be a link at the top of the email to current page the user was on. Does not really make since, for example if you acknowledge hosts from within the unhandled problems page, to be linked to the unhandled problems page. Therefore, changing this link to always point to the problems page. Fixes #501 commit 6a84e59c27d63c840569df60c22503d27e972d33 Merge: 4f72532 fd49f2c Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 21 11:59:51 2014 +0100 Merge pull request #512 from opinkerfi/feature-livestatus-limit Limit per page hosts/services in status interface commit fd49f2caa5170f723602542762231bbd082533e5 Merge: 46e648a 4f72532 Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 21 11:59:19 2014 +0100 Merge branch 'master' into feature-livestatus-limit Conflicts: adagios/status/utils.py commit 4f72532d1eac09b1cf4ef3cb0ec4381aa1670ebf Merge: 3054aee c862a7f Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 21 11:52:24 2014 +0100 Merge pull request #507 from opinkerfi/feature-logfiles-settings Funnel all calls to LogFiles>utils.get_log_entries commit c862a7f67bbce9acc80e4b3b0b685d8a9db8baab Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 14 14:22:50 2014 +0100 Make log access configurable This patch creates a new setting 'enable_local_logs' which if set to false will disable all reading of log files. This will help in cases like #495 where log access is a supposed CPU hog for the adagios interface, and makes it simple to turn log access off when troubleshooting performance issues. Also affects issue #503 as one part of solving top_alert_producer issues. commit ffdf95dee1f354038826cf39e776769e08a3b3f8 Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 14 14:19:05 2014 +0100 status/rest: Use utils.get_log_entries internally commit 6698ea7a4a0152bdd90fd0f917e207789571981b Author: Pall Sigurdsson <[email protected]> Date: Sat Dec 13 17:18:46 2014 +0100 Funnel all calls to LogFiles>utils.get_log_entries This affects issue #503 indirectly because it is the first step in allowing us to disable log lookup globally or limit max size of logs read. Also this might allow us in the future to switch to alternative backends. commit 46e648a857d6d3a32e99cb4f0ac1c7fe088384d0 Author: Pall Sigurdsson <[email protected]> Date: Sat Dec 13 17:06:14 2014 +0100 Limit per page hosts/services in status interface commit 3054aeeae2f17e84b52473f79320bebaa2002760 Merge: 4d21531 1648699 Author: Pall Sigurdsson <[email protected]> Date: Mon Dec 8 21:27:09 2014 +0100 Merge pull request #492 from opinkerfi/fix-saved-search-with-spaces Fix delete of saved searches with spaces commit 4d215310b815ad9b33c71b6212bbb64f51ce2598 Merge: 4dc255d 781c1ac Author: Pall Sigurdsson <[email protected]> Date: Sun Dec 7 11:12:03 2014 +0100 Merge pull request #499 from opinkerfi/fix-timed-refresh-servicepages Fix timed reload on service pages commit 781c1ac44d72f637c672b378c5f87bb8b5c7baa0 Author: Pall Sigurdsson <[email protected]> Date: Thu Dec 4 21:30:54 2014 +0100 Fix timed reload on service pages Timed refresh on service pages was using obsolete code, changed it so that now we are using the same reload behavior as status overview does. Fixes #438 commit 4dc255d153408efdd34ed9c3713d6c9bb32ce350 Merge: 145970c c31bfaa Author: Pall Sigurdsson <[email protected]> Date: Wed Dec 3 22:43:19 2014 +0100 Merge pull request #496 from opinkerfi/fix-service-detail-spaces service_detail page javascript errors on spaces commit c31bfaa47d062853b9506fc5187c8cd454caa7f9 Author: Pall Sigurdsson <[email protected]> Date: Wed Dec 3 22:40:52 2014 +0100 service_detail page javascript errors on spaces This patch fixes a bug in adagios.misc.populate_search_with_querystring_fields() javascript code that would generate an incorrect jquery selector if you were on a service detail for a serice with space in the description. This would cause javascripts to fail on that page, including 'other services on this host' breaking. commit 1648699c107ebb433f774b144db089ead183ec24 Author: Pall Sigurdsson <[email protected]> Date: Tue Dec 2 00:38:34 2014 +0100 Fix delete of saved searches with spaces Without this patch, saved searches break when there is a space in the search name. commit 145970c6a3fa853041297c5f6a2e12b06799a51d Merge: 3d7bbc2 787613d Author: Pall Sigurdsson <[email protected]> Date: Tue Dec 2 00:21:25 2014 +0100 Merge branch 'feature-saved-searches' commit 3d7bbc29c6202b5eb74e35bbb5de3d7b38c5519d Merge: 334525a f97de7e Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 23:08:41 2014 +0000 Merge pull request #490 from opinkerfi/fix-setup.py-overwrites-adagios.conf2 setup.py should not overwrite adagios.conf commit 334525a53d932951c53f4d0c8e71d8bfab2a3a63 Merge: 3330f87 12b8255 Author: Pall Sigurdsson <[email protected]> Date: Tue Dec 2 00:08:12 2014 +0100 Merge pull request #491 from opinkerfi/fix-advanced-search-rebase Fix bad merge which removed advanced search commit 3330f871fdb779f636eed33c8b7706e7eb50f8aa Merge: 19fa529 b20a19f Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 23:08:00 2014 +0000 Merge pull request #489 from opinkerfi/fix-bi-delete /bi/: Deleting process should remove references commit 12b82556b0bd01cb684e8250fd6f0556cf3307f0 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:59:23 2014 +0000 Fix bad merge which removed advanced search commit 19fa529503a815bd403b03fa73311ff34156efa1 Merge: 280cfd1 dcc04e0 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:48:30 2014 +0000 Merge pull request #487 from opinkerfi/feature-script-for-building-all-branches Add script build_branches.sh commit 280cfd101b6684bb6b8dedfd9fe71b01fa112e34 Merge: fc41e28 60417e9 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:47:54 2014 +0000 Merge pull request #485 from opinkerfi/fix-context_processor Fix Custom SSI typo commit fc41e28edd24b3a7d807237bc7f642d079797b27 Merge: 2c5f6dc 8a17aa1 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:45:33 2014 +0000 Merge pull request #484 from opinkerfi/fix-missing-modals Fix missing modals on some views commit 8a17aa1ebc3035f19eaf64c670ae628d86fa817b Merge: 10e12ae b37f9b3 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:30:55 2014 +0000 Merge branch 'fix-missing-modals' of github.com:opinkerfi/adagios into fix-missing-modals commit 10e12aef9f9951caad1c33102f735438b0ade304 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 13:02:58 2014 +0100 Fix missing modals on some views Move a few modals from base_status.html to base.html because they were being used on more views than just status views. Fixes #377 commit 2c5f6dc0fa71fccb796dd760776ff7fae891ca73 Merge: 4c15f85 a069367 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 22:08:27 2014 +0000 Merge pull request #483 from opinkerfi/feature-import-objects New endpoint: /objectbrowser/import commit 787613d80308bc27ab5a08ebac10c4007d2878e5 Author: Pall Sigurdsson <[email protected]> Date: Mon Dec 1 22:58:07 2014 +0100 Fix typo in adagios_status Typo in call to populate_saved_searches_sidemenu caused saved searches not to be updated until page was refreshed. commit 4c15f85e722e6ddf00ae3fe953a0a8b1c2002706 Merge: fb733a4 6aa1ff8 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:55:10 2014 +0000 Merge pull request #482 from opinkerfi/fix-typo-in-perfdata2 Fix typo in status/perfdata2 commit fb733a419df07556f5ce7421dbeb6eeea56949ed Merge: 46f725d 3be4256 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:54:09 2014 +0000 Merge pull request #481 from opinkerfi/fix-global-variables Explicitly update globals in context processors commit 46f725d17c4c6887ab40812d0281bc5b3e963b63 Merge: c39375b 608cec0 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:53:10 2014 +0000 Merge pull request #479 from opinkerfi/feature-ssi-in-emails Serverside includes for emails commit c39375be589adc90d9eb35aeb7df1aa84b363321 Merge: 7d68570 44b950f Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:45:53 2014 +0000 Merge pull request #476 from opinkerfi/advanced-search-dialog Advanced search dialog commit 7d6857070f81452561108146e4242c181716b5cb Merge: b13dacf e316fd6 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:43:08 2014 +0000 Merge pull request #475 from opinkerfi/cleanup-utils_get_xxx Code cleanup - Refactor utils.get_services() commit e316fd6114fb938ac93092a8c4576d61eae5848f Merge: 47e96a6 b1b39f9 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:41:21 2014 +0000 Merge pull request #477 from opinkerfi/feature-unhandled-is-configurable Make unhandled hosts/services configurable commit f97de7eefbbfd6e853b487af3277a5f161031fd9 Author: Pall Sigurdsson <[email protected]> Date: Mon Dec 1 21:57:54 2014 +0100 setup.py should not overwrite adagios.conf Removing adagios.conf from setup.py Fixes #411 commit 663db55ab6f9c6652acc457c3f8c819f70fa98fa Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:08:38 2014 +0000 Test subclassing pynag instead of mapping functions commit 49599642c5cff68f9c077e9ac881cb7ec7c1c2e5 Author: Tomas Edwardsson <[email protected]> Date: Mon Dec 1 21:08:07 2014 +0000 Update sudoers for systemctl and nagios group usage commit b20a19f9fa76d45220e0a7f09eae2873d4e8c329 Author: Pall Sigurdsson <[email protected]> Date: Mon Dec 1 21:20:08 2014 +0100 /bi/: Deleting process should remove references This patch makes sure that when a process is deleted, all references to this process from other places are also deleted. commit dcc04e0c0b49a49185a32574ff1a645d302177fb Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 20:00:41 2014 +0100 Add script build_branches.sh This is used for test.adagios.org to build all branches commit 60417e9b68d3f635c10f07ccabf8b263963b2e65 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 18:32:39 2014 +0100 Remove extra print statement commit 8dc109adf97de10ff8c2ae03ab60f4e5c9519407 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 15:03:33 2014 +0100 Fix Custom SSI typo This patch fixes a bug where urlname was not correctly resolved when doing custom server side includes. Fixes #386 commit b37f9b3c2d47dd5e0be8afdb8ea7a49d29f892f1 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 13:02:58 2014 +0100 Fix missing modals on some views Move a few modals from base_status.html to base.html because they were being used on more views than just status views. Fixes #377 commit a069367fe977be13fcdd0006157dfa0c220fa402 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 30 12:43:40 2014 +0100 New endpoint: /objectbrowser/import Allows importing of objects from a CSV style input * New view /objectbrowser/import * Added link to "top-right-cogwheel" called "import objects" * Primitive duplication support (i.e. refuses to import objects already in config) * Allows preview of what will be saved Fixes #382 commit 6aa1ff877a80267938fdebb53aa975551b65efab Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 19:15:51 2014 +0100 Fix typo in status/perfdata2 commit 3be42560222329571002f707b0c818bca44c7a69 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 19:14:07 2014 +0100 Explicitly update globals in context processors This patch ensures that pynag.Model.cfg_file is always updated before other context processors are executed. Fixes #480 commit 608cec07cbc980ad105fc63dca702d029c34f7f6 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 19:02:13 2014 +0100 Serverside includes for emails This patch adds the ability to inject serverside includes in emails Additionally improves the html in base.html so that it is always clear what is the name of ssi relevant for current SSI. commit 44b950f5532393375376766ca683db3d00f5f963 Merge: 229d6a1 b13dacf Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 18:56:58 2014 +0100 Merge branch 'master' into advanced-search-dialog commit 1737af3b9457554cb2ce59e47d72bf5d12f275eb Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 18:53:48 2014 +0100 New feature: Saved searches This patch adds "Saved searches" to adagios. How it works: * User opens a specific view (like a specific service detail) * User clicks the + add the bottom of left sidemenu * User gives a name to this search and clicks save * The saved search is added to the left sidemenu commit 0a41997b78aa68f65f02eebd5d9927079cc6f5eb Merge: 18b852c 229d6a1 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 15:57:19 2014 +0100 Merge branch 'advanced-search-dialog' into dev commit 18b852cb87cffc042b71f019e6af28c734827418 Merge: 71e0e6a b1b39f9 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 15:57:09 2014 +0100 Merge branch 'feature-unhandled-is-configurable' into dev commit 71e0e6ad4f942318def0493e51fceb341d372845 Merge: b13dacf 47e96a6 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 15:56:59 2014 +0100 Merge branch 'cleanup-utils_get_xxx' into dev commit b1b39f95df3ccd8b78b5fd0ed644074d0927f2f4 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 15:20:00 2014 +0100 Make unhandled hosts/services configurable This patch moves the definition of unhandled/open problems into settings.py As a side effect of this, definition of unhandled can be overwritten in adagios.conf by adding these to the config file: UNHANDLED_SERVICES = { 'state__isnot': 0, 'acknowledged': 0, 'scheduled_downtime_depth': 0, 'host_state': 0, 'host_scheduled_downtime_depth': 0, 'host_acknowledged': 0, } UNHANDLED_HOSTS = { 'state': 1, 'acknowledged': 0, 'scheduled_downtime_depth': 0 } This partially fixes #471 although we are not providing the ability yet to configure this from the settings web interface. commit 229d6a148e48fd88d749ec8d937837e268ada716 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 14:57:43 2014 +0100 Advanced Search Dialog for adagios This commit implements a prototype for a search dialog Currently it is limited only to specific fields and only supports services This is a prototype for testing only commit 47e96a6da2bdb3df6c171d6add13e20ee5453401 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 29 14:40:41 2014 +0100 Refactor and code clean up in adagios.status.utils The code cleanup is not done yet, there is still a big mess but situation is better now. * Refactor get_services() * Refactor get_hosts() * Use constants instead of magic strings wherever possible * Add a bunch of unit tests for the refactored functions * Taking advantage of latest LivestatusQuery (so update pynag) commit b13dacf44b7b0d3b8a89bf261a59d235faded359 Merge: 6a128b2 cdca99f Author: Tomas Edwardsson <[email protected]> Date: Thu Nov 27 00:17:04 2014 +0000 Merge pull request #467 from opinkerfi/fix-obsolete-services-in-state_history Fix obsolete services in state history commit 6a128b2dff2c831bdb6f066a833d0b8afa12c709 Merge: 78356b7 235bdb2 Author: Tomas Edwardsson <[email protected]> Date: Thu Nov 27 00:15:12 2014 +0000 Merge pull request #466 from opinkerfi/fix-default-template-when-adding-objects Fix Implicit use of 'generic-host' template in objectbrowser/add/host commit 78356b77e896e85e77717eed8cb2cf8bdc58a009 Merge: 182eb38 e0a8dc4 Author: Tomas Edwardsson <[email protected]> Date: Wed Nov 26 23:37:48 2014 +0000 Merge pull request #468 from opinkerfi/fix-unicode-errors-in-objectbrowser-form Fix unicode errors in objectbrowser form commit 182eb38fdd545da8b50a5af6f65d056d4deff9d4 Merge: 8839c05 ef23883 Author: Pall Sigurdsson <[email protected]> Date: Wed Nov 26 22:12:39 2014 +0100 Merge pull request #473 from hakong/patch-4 Fix adagios-logo-32.png path commit ef238836115b3ae418afcc51bfe55825864b365f Author: hakong <[email protected]> Date: Wed Nov 26 01:06:02 2014 +0000 Fix adagios-logo-32.png path The img tag was closed with />, but should just be closed with >. commit 637cb623c05122b5412c92f35e0ee5748253fa68 Author: Pall Sigurdsson <[email protected]> Date: Wed Nov 26 00:41:21 2014 +0100 Code cleanup - Refactor utils.get_services() Clean up utils.get_services. This requires latest pynag. commit 8839c052ea9cc266609f34f3cd199387810ac7c3 Merge: be65814 f0a9cd3 Author: Pall Sigurdsson <[email protected]> Date: Tue Nov 25 23:48:02 2014 +0100 Merge pull request #461 from petemorgan/contactgroups-fix Contactgroups fix to display members commit f0a9cd3a122099ac1f091592e78d447dcd20b92d Author: Pete Morgan <[email protected]> Date: Mon Nov 24 21:02:40 2014 -0500 Fixed copy and pasted comments commit be658149a9120dec2dd91b268c8e8124187b9cc9 Merge: e4eb34d 4c380ad Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 23 20:54:34 2014 +0000 Merge pull request #469 from opinkerfi/fix-unicode-in-adagios-conf Allow unicode characters to exist in adagios.conf commit 4c380ad4a7bfc0c85a1c533a5c25b87e63465ad8 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 23 03:13:08 2014 +0100 Allow unicode characters to exist in adagios.conf Fixes #396 commit e0a8dc43097ce940603e87f2f713e67d64892503 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 23 03:04:34 2014 +0100 objectbrowser/forms.py: Minor cleanup Ran code inspection on file and did minor cleanup. commit 26de9a766f4a5ef8e124bc938211807247ffb44f Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 23 02:59:08 2014 +0100 Fix: Unicode errors in objectbrowser forms Several places in objectbrowser forms have string formatting in the form of "%s" % variable which is subject to UnicodeDecodeError when variables contain non ascii character. We workaround that by calling smart_str() around dangerous variable names. Fixes #404 commit cdca99fd3c9a2cc4d8c7c78b892686688a8739d5 Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 23 02:35:48 2014 +0100 status/state_history: Remove obsolete services This patch removes all services from state_history view appear in the state history log, but have been deleted since last activity. Fixes #395 commit 235bdb2215919c3b590e53d83ba59bd48cf7380a Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 22 19:13:13 2014 +0100 objectbrowser/add: Fix Implicit generic-host Fixes #459 This patch fixes an issue in objectbrowser/add/host when generic-host is implicitly selected as a template without checking if there is a template called generic-host. This patch makes the following changes: * Make template used e.g. "generic-host" configurable from settings * Change objectbrowser/add so that if the specified template does not exist, then empty string is used as an initial value for template * Same patch applied for services and contacts as well. commit e4eb34d059b8d2d1902b6ae94e7f37cbefed3cd4 Merge: 6b59065 93e7162 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 22 18:52:53 2014 +0100 Merge pull request #464 from titilambert/master Add Adagios icon in top navbar commit 6b5906543f87c40e010ce68835b653f3aea9e4e0 Merge: a894a5f d7acf64 Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 22 18:47:59 2014 +0100 Merge pull request #457 from opinkerfi/selenium_rework Selenium rework commit a894a5f6b6702cb2fe5df5f5148d0f858d8904fa Author: Pall Sigurdsson <[email protected]> Date: Sat Nov 22 18:23:21 2014 +0100 status/detail: Fix line-height for check_command Fixes #453 commit 93e7162fc0bce608502d059c3de2da22d668249b Author: Thibault Cohen <[email protected]> Date: Tue Nov 18 10:55:38 2014 -0500 Add Adagios icon in top navbar commit 8ea7d305ad88fb9e13789c820e70fcddea1042ff Merge: 3cc88c3 bc65de9 Author: Pall Sigurdsson <[email protected]> Date: Mon Nov 17 23:37:48 2014 +0100 Merge pull request #463 from titilambert/images Add Adagios images commit bc65de9c19beeaf33e70f8ad00e6d482bec31ea9 Author: Thibault Cohen <[email protected]> Date: Mon Nov 17 10:54:50 2014 -0500 Add Adagios images commit 81f4aee813a62e9a803452d97cf707f52371f045 Author: Pete Morgan <[email protected]> Date: Thu Nov 13 22:10:31 2014 -0500 Fixed typo in views.py commit 10ae1a672536c18d1c65f0ecc54e0254422a98ac Author: Pete Morgan <[email protected]> Date: Wed Nov 12 23:49:58 2014 -0500 Fix to display contact members in status_contactgroup.html template commit 85efa4fd76f3f404de601ff2b42d2c669fcd6ba2 Author: Pete Morgan <[email protected]> Date: Wed Nov 12 13:25:59 2014 -0500 Updated status_contactugroup.html to fix contactgroup members listing commit d7acf64d1618273917c5c090742c4e28d3811fb3 Author: Tomas Edwardsson <[email protected]> Date: Mon Nov 10 18:41:06 2014 +0000 Make selenium tests skip if there is an error Wrapped webdriver initialization in a try/except and skip if unable to initialize the webdriver in use. Running with "python manage.py test -v 2" will show the reason for skipping. commit 799d78203aa8ff424005213f5bfb3788ba4c611a Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 21:30:08 2014 +0000 Initialize fake adagios env after selenium If selenium initialization failed the fake adagios env would not be destroyed leaving nagios daemon processes hanging around. commit 7dd4c166f1c19d84eea5d4de80cfc4940308da1a Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 20:44:34 2014 +0000 Remove unused imports and move imports to top commit 7d1bb88b04521beee85f12e757a7ef13bae722c7 Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 20:24:41 2014 +0000 Fix stdout/err and add status commit deee758b01b6482460358fb63f08f6aee2b477cf Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 14:29:12 2014 +0000 Skip selenium for pull requests from forks commit f3cae387eaa5b618e0e13a5259e9c0961c633509 Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 14:04:39 2014 +0000 Invalid variable name access_keys, fixed commit 1415844bbc92f933ced3706057d1bda765262624 Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 14:01:59 2014 +0000 adagios.daemon in bi and misc.forms commit 3cc88c3314b698d13f954dfeebd4598d4528c04c Merge: 92cf215 d27569c Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 9 14:56:44 2014 +0100 Merge pull request #430 from petemorgan/grey-recheck-button Disable reschedule button in status_detail if active checks are not enabled commit 92cf2151ec2c1929bd79b20685fa4e1edd999386 Merge: 67c7014 3709cbc Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 14:19:14 2014 +0100 Merge pull request #456 from opinkerfi/remove-chosenjs Remove chosen javascript commit f4a423c7a501bc8e9f5a810431bbf39b186765a3 Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 12:43:03 2014 +0000 Selenium rework Make each app within adagios run it's own browser session. Initial work to allow for testing multiple browsers in the same run. commit 3709cbc31081492dd77ab2c5fd893e29f3ab5d5b Author: Pall Sigurdsson <[email protected]> Date: Sun Nov 9 13:29:36 2014 +0100 Remove chosen javascript Seems like we are not using this anywhere: $ grep -irl chosen . ./.git/index ./adagios.spec ./adagios/settings.pyc ./adagios/settings.py ./adagios/media/external/select2/README.md ./adagios/media/external/chosen/chosen.proto.min.js ./adagios/media/external/chosen/chosen.css ./adagios/media/external/chosen/chosen.proto.js ./adagios/media/external/chosen/README.md ./adagios/media/external/chosen/LICENSE.md ./adagios/media/external/chosen/chosen.jquery.min.js ./adagios/media/external/chosen/chosen.jquery.js commit 8a261894ce8809933706de082e6c285ac888ed7a Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 12:02:38 2014 +0000 SeleniumTestCase moved, add multiple webdrivers SeleniumTestCase moved to dedicated file seleniumtests.py Removed driver class variable Added support for multiple webdrivers commit 87bde32c0424c8359af14e4d1655fe9afac6ac2c Author: Tomas Edwardsson <[email protected]> Date: Sun Nov 9 11:30:30 2014 +0100 Remove pynag.Control and add adagios.daemon commit 67c7014f99c546606b993462fbca2cb06f496887 Merge: ac91cd0 82f6b82 Author: Pall Sigurdsson <[email protected]> Date: Wed Oct 29 22:49:01 2014 +0100 Merge pull request #441 from opinkerfi/selenium_tests Selenium tests commit 82f6b8299daad1defdc23dad7183d8380491094f Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 01:38:08 2014 +0000 Call quit instead of close This completely closes webdriver commit 0db0d208bf24553204a497f2c0b14fe215306e38 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 01:35:12 2014 +0000 Look for more than zero, failed on 1 host commit ea3a855f03930e3c2cac72436be47d42e1cd5af0 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 01:34:58 2014 +0000 Make driver only exit once commit 849e4e3c8637707fc75a96984dad6e14cd64853c Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 01:23:53 2014 +0000 Set hub_url to saucelabs commit 7840a0d6258e1b7820986eb0d95db00746144367 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 01:10:22 2014 +0000 More work on travis saucelabs integration commit 07f174a1e561acce48edec6edd8a2079d6cbd656 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 00:38:16 2014 +0000 Test hooking up travis-ci with saucelabs commit 6fac22afecae3e0b882ce7593ea3b80f71535584 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 00:07:15 2014 +0000 Use same selenium session across unit test files commit 57f1c1547c5a70da381921afe0212beb71716b98 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 00:06:56 2014 +0000 Allow testserver to run on multiple ports commit 03f495723d015db7a7b0193bae733dc6ee2cc25c Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 28 00:06:35 2014 +0000 Add missing import of By commit b0faf9a21746000d33b0f6f564ba0aa7cb99996e Author: Tomas Edwardsson <[email protected]> Date: Mon Oct 27 23:29:40 2014 +0000 Add selenium tests for objectbrowser commit e7ad2df638ac52930825a97e2516a33707c4cc50 Author: Tomas Edwardsson <[email protected]> Date: Mon Oct 27 23:28:52 2014 +0000 Only run LiveServerTestCase if selenium is there commit dda19a54f0b64d30e0f294000bc61253667a22c2 Author: Tomas Edwardsson <[email protected]> Date: Mon Oct 27 21:35:57 2014 +0000 Move SeleniumTestCase to utils.py, re-usability SeleniumTestCase can be used by many components withing adagios and should not live within status/ commit ac91cd0fb02b0ccf3eab9838575e7b51fbed26cd Merge: 76cf799 747eda5 Author: Pall Sigurdsson <[email protected]> Date: Mon Oct 27 20:45:19 2014 +0100 Merge pull request #443 from titilambert/debian Clean packaging commit 76cf79916bdafda96e47df493182923556a5c196 Merge: 47fd775 38ce2b2 Author: Pall Sigurdsson <[email protected]> Date: Mon Oct 27 20:38:20 2014 +0100 Merge pull request #448 from giner/patch-1 setup.py: update dependencies commit 38ce2b2d3a3f0a6aaf0a9a6ba6f62b332102241f Author: Stanislav German-Evtushenko <[email protected]> Date: Mon Oct 27 15:24:32 2014 +0300 setup.py: update dependencies Adagios 1.6.1 doesn't work Django 1.7.x so we require version between 1.4.x and 1.6.x. commit 47fd77516293e413336796184e6e7f4c836cb123 Author: Tomas Edwardsson <[email protected]> Date: Thu Oct 23 10:50:48 2014 +0000 Bumped version number to 1.6.1 commit 4f3d33e22e50171bca250964ea70917f40b4ae69 Merge: c435314 fb2beb6 Author: Pall Sigurdsson <[email protected]> Date: Wed Oct 22 21:51:33 2014 +0200 Merge pull request #444 from opinkerfi/release_161 Proposed release 1.6.1 commit fb2beb6f1de2f31dcbbd628e9881f5168ff63995 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 22 11:35:26 2014 +0000 Missing space in description commit c4aa3236f31e32925f1a05ede99730f5ae848561 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 22 11:34:01 2014 +0000 freecode is closed for updates See, http://freecode.com/about commit a6b1bcd21bac529499e40d77e689b4cabf52dcf5 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 22 11:30:16 2014 +0000 Update CHANGES for 1.6.1 release commit 747eda5b8011ca3d2ad1055e167656db437f7999 Author: Thibault Cohen <[email protected]> Date: Wed Oct 22 00:52:56 2014 -0400 Clean packaging commit a1a7f175eae63a9aed381b8d2fa9f09bcb0c7ddf Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 21 10:45:46 2014 +0000 Skip selenium tests properly when not installed commit 026ed3c3b697185e88fec8e20daa71ea514a0019 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 21 10:40:14 2014 +0000 Move away from splinter to selenium commit 9ec9d4d1079c359b84b8b413c49e9bf085689d02 Merge: ba23c60 c435314 Author: Tomas Edwardsson <[email protected]> Date: Tue Oct 21 10:13:27 2014 +0000 Merge branch 'master' into splinter_browser_tests commit c435314d15cd0ef384aff568a298b446d5b1471f Merge: af7a22f 7273a2d Author: Pall Sigurdsson <[email protected]> Date: Sat Oct 18 20:48:39 2014 +0200 Merge pull request #437 from titilambert/upstream Fix changelog commit 7273a2def5dd4606671118e835d549a4e7c09618 Author: Thibault Cohen <[email protected]> Date: Wed Oct 15 22:24:16 2014 -0400 Fix changelog commit af7a22f6ab5f9e8198704699ed1d5044fcd4eff5 Merge: 1b6f005 cb473a7 Author: Tomas Edwardsson <[email protected]> Date: Mon Oct 6 14:26:06 2014 +0000 Merge pull request #426 from opinkerfi/fix-bi-break-nagios-configuration Fix bi unittests writing outside sandbox commit 1b6f0058a02e52a7930813fe30d01262e5abf51e Author: Pall Sigurdsson <[email protected]> Date: Thu Oct 2 19:15:06 2014 +0200 Objectbrowser - remove leftover breadcrumbs It seems that previously when breadcrumbs where removed, the edit_object view was forgotten (maybe because edit_object was never migrated to the new template). Current breadcrumb is kind of pointless anyway, since it is only a few pixels from the "home" and "configure" buttons, and we dont have an ability to link specifically to all object types (like servicegroups) Fixes #414 commit 19ea657c4f3da2b0724649232664f375a2518582 Author: Pall Sigurdsson <[email protected]> Date: Thu Oct 2 19:30:08 2014 +0200 setup.py - change requires -> install_requires The keyword arguments have changed in distutils. Fixes #412 commit f0fa5083efadf3fc2b2c28eb62a3287105d4bd8c Merge: efcb59b d01f507 Author: Pall Sigurdsson <[email protected]> Date: Mon Oct 6 13:59:42 2014 +0200 Merge pull request #431 from opinkerfi/django16-final Add support Django 1.6 commit d01f507f1fd3fa374fae37ce215581b13cdd0bd7 Author: Pall Sigurdsson <[email protected]> Date: Sun Oct 5 23:41:32 2014 +0200 fix okconfig.conf config format Conflicts: .travis.yml commit d9a7e230bbee8dd4651ffc58405641a70a4ab2cb Author: Pall Sigurdsson <[email protected]> Date: Sun Oct 5 23:25:36 2014 +0200 Generate okconfig.conf in travis commit f50209adbe95da711a024a03e399b5d1a6bbb42d Author: Pall Sigurdsson <[email protected]> Date: Sun Oct 5 22:55:18 2014 +0200 sudo in front of okconfig init commit de0683e242cf9c233bbbecb573a3c5023ee3e3a7 Author: Pall Sigurdsson <[email protected]> Date: Sun Oct 5 19:47:51 2014 +0200 travis.yml - fix okconfig.path paths commit 5531182d1f1e12f5a9cc8e3d53b6a23e7cab5a9b Author: Pall Sigurdsson <[email protected]> Date: Sun Oct 5 18:39:31 2014 +0200 travis - pip install okconfig from github commit 3063073f2a3203eff79e61718da56e7531c5e0a4 Author: Tomas Edwardsson <[email protected]> Date: Fri Oct 3 15:59:48 2014 +0000 Don't run okconfig init as root Conflicts: .travis.yml commit 2cabd000adf0b8f2937d0e231669a39a10c6aa1c Author: Tomas Edwardsson <[email protected]> Date: Fri Oct 3 15:49:53 2014 +0000 Install /etc/adagios/conf.d files This enables testing of plugins, adagios.status and adagios.okconfig. commit 4500b63f92cf268285881f3f5f5edc1b62eb07c3 Author: Tomas Edwardsson <[email protected]> Date: Fri Oct 3 10:54:54 2014 +0000 Added paramiko to travis build commit 4d542f8948a14d228a0f1f62d0bfc003e9f63c61 Author: Tomas Edwardsson <[email protected]> Date: Thu Oct 2 16:59:36 2014 +0000 Remove debug print statements commit e4829d2046f42abf96344d0e85468236cbf5a0d1 Author: Tomas Edwardsson <[email protected]> Date: Thu Oct 2 16:57:04 2014 +0000 Fix earlier PYTHONPATH patch commit 32fa563ec0ff5dc6a4615f1a0037d283cf0583e3 Author: Tomas Edwardsson <[email protected]> Date: Thu Oct 2 16:46:25 2014 +0000 Run PYTHONPATH relative to manage.py commit 09e899556fc21014569a305fdae9dc36ce69525f Author: Tomas Edwardsson <[email protected]> Date: Thu Oct 2 15:33:46 2014 +0000 Compatiblity, render instead of render_to_response Django has incompatible use of render_to_response, using mimetype in 1.4 but content_type in 1.4<. commit 40c97e0460b5f45cbd1ea4ee5204da20896b7e35 Author: Pall Sigurdsson <[email protected]> Date: Thu Oct 2 15:50:11 2014 +0200 PynagForm._get_changed_data => changed_data This fixes unit tests that broke after upgrade to django 1.6 commit 4ac18c3368fb08314e3a89713033d4e0c18db802 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 23:37:12 2014 +0000 Started work on ironing out support for django 1.6 commit d27569cb9bafd26cd4e5cc356cb81112041cfbab Author: Pete Morgan <[email protected]> Date: Fri Oct 3 01:11:38 2014 -0400 Disable reschedule button in status_detail if active checks are not enabled commit cb473a7a70fdb46fded695d8167298fb3ab14861 Author: Pall Sigurdsson <[email protected]> Date: Thu Oct 2 17:49:54 2014 +0200 Fix bi unittests writing outside sandbox Fixes #420 commit efcb59b8ac8446cc92169d7088fe3bf5756cd71a Merge: 83d092a 81e6427 Author: Pall Sigurdsson <[email protected]> Date: Wed Oct 1 18:08:42 2014 +0000 Merge pull request #424 from opinkerfi/rhel6-djangoconflicts Added conflict for Django older than 1.4.0 commit 83d092ade399999caff7b610e2f6eeaa741eb784 Merge: f7ede51 3491087 Author: Pall Sigurdsson <[email protected]> Date: Wed Oct 1 18:07:50 2014 +0000 Merge pull request #425 from opinkerfi/ajax_contenttype_fix Fix wrong content type sent with ajax calls. commit ba23c608e99eb0b418638580c7a21967803a2bab Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 16:06:14 2014 +0000 est for too many top_alert_producers commit 3491087580bdd15c346317a022d96cc4525eda72 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 15:47:06 2014 +0000 Fix wrong content type sent with ajax calls. Most of the calls to the ReST api were broken in django 1.5 as a result of sending application/json in the request on POSTs. Reference: https://docs.djangoproject.com/en/dev/releases/1.5/#non-form-data-in-http-requests Added a unit test to check returns of top_alert_producers although that was not triggered during this specific issue. commit 81e6427e237df585418b0fdd288f0c3ac9dc7905 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 10:20:35 2014 +0000 Added conflict for Django older than 1.4.0 Centos/RHEL shipped with Django-1.3 originally, those unfortunate souls that installed before the Django14 need to remove Django and install Django14. Done via: yum remove Django yum install Django14 Another option could be to insist on upgrading to python-django15. Which might be intrusive for more users but make it easier to obsolete django 1.4 in the future. Done via Conflicts: Django < 1.5.0 commit f7ede516b86c24811f0133ea88cb89dec68736b0 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 00:11:16 2014 +0000 Continiously better django version testing in trav commit 18205b129e268894ced6e70401f159fea3666c7c Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 00:08:36 2014 +0000 More correctly set django version for travis... commit 2bafa2c355eb09112849864d6b4a45dbcfdb8c99 Author: Tomas Edwardsson <[email protected]> Date: Wed Oct 1 00:03:18 2014 +0000 Correctly set Django version in travis commit f4649fe0dc4f22221a879ba05d5627c40b01c2ed Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 23:59:46 2014 +0000 Run travis for django 1.4 and 1.5 commit 71b63cc285881b87d39514f2df7795d980534dee Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 23:54:04 2014 +0000 Input form formating changed in django 1.5, use re Using regex match to correctly run this test between django versions. commit c9b14ef738d6f82d450d144b9b13deb1dc562660 Merge: 4cae268 c542dd4 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 23:51:51 2014 +0000 Merge branch 'django15' Conflicts: adagios/objectbrowser/templates/copy_object.html adagios/status/templates/status_perfdata.html adagios/status/templates/status_perfdata2.html commit 3e0de0ff832d15255081ee4a092924ea0d696211 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 23:22:43 2014 +0000 Support for arguments to splinter commit 4cae268b1aa767ad1d4d6a0875901b79c5563e9b Merge: a07282f de53ac1 Author: Pall Sigurdsson <[email protected]> Date: Tue Sep 30 22:39:57 2014 +0200 Merge branch 'master' of github.com:opinkerfi/adagios commit 8f3f229df943f9a811f00a25e6067251c2304d4a Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 15:55:26 2014 +0000 Splinter based browser testing added Adds tests using selenium and actual browsers using webdriver. TEST_SPLINTER environment variable enables this type of testing. Test cases added: /status - check that Status Overview, Network Parents returns a number. /status/services - clicks multi select box and selects all services. Confirms that all services are selected. commit 7a4ea704a82ca62a0cffe37d6e25d39336818ff7 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 15:54:49 2014 +0000 STATIC_URL needed for LiveServerTestCase django.test.LiveServerTestCase errors out if STATIC_URL is not defined in settings. commit de53ac183514a7e9d36e611ea687c3927aef616b Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 11:40:55 2014 +0000 enable_pnp4nagios feature added to CHANGES commit 8e5b1001493ca66267fa858ece008f7aac2db09f Merge: acef61d 6f9ac00 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 30 11:38:10 2014 +0000 Merge pull request #417 from petemorgan/petemorgan Adding a configuration flag: enable_pnp4nagios commit c542dd4589b8b5bf71f595961196ef58200aa75f Author: Tomas Edwardsson <[email protected]> Date: Sun Sep 28 21:51:41 2014 +0000 python-simplejson is required commit 41e69ee79849a663da1833f0e1de8fb676a32ffa Author: Tomas Edwardsson <[email protected]> Date: Sun Sep 28 21:46:29 2014 +0000 Load compatibility url template tag for 1.4 Template syntax for url changed requiring quoting the parameter. This works correctly under 1.3 and newer. commit 6f9ac00e189d236667b10d37aab3b5fb2107e52d Author: Pete Morgan <[email protected]> Date: Sat Sep 27 22:01:13 2014 -0400 Fix metrics display when no graph data present commit 67d6b19f11e0ca4bbc62cf302fdf1a01a983af8d Author: Tomas Edwardsson <[email protected]> Date: Wed Sep 24 13:16:16 2014 +0000 Move from using static to urls static did not play well with relative paths, migrated back to using media urls. commit a3f229702f92d421d286d81ae56bf9e1aedb5bd3 Author: /bin/bash <petem@centos6.(none)> Date: Tue Sep 23 22:32:45 2014 -0400 Updated status_perfdata*, top_navigation_bar for enable_pnp4nagios commit ee4ca2dced96d8a1b136b48d1a21ecab7c96147c Author: Tomas Edwardsson <[email protected]> Date: Wed Sep 24 00:16:16 2014 +0000 Move static back to media, makes the update smoother commit acef61df5e8a0bd70ee0ad67d0e619610ec52347 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 23:30:10 2014 +0000 Removed builders for epel5 commit 1aa4513411954cf689281ecb9090c14d3f04bf05 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 22:56:25 2014 +0000 Added rhel7 builder commit 3cc7dded8de7387f099dec1159dc46b187a7c2bb Merge: d5b60c4 830dd73 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 22:54:30 2014 +0000 Merge pull request #393 from opinkerfi/objectbrowser-multichoice-fields Replace PynagChoiceField with PynagAutoCompleteField commit e544c61ffd506641456c174425db8c4bbf02a875 Author: Pete Morgan <[email protected]> Date: Tue Sep 23 13:17:42 2014 -0400 Fixed typos and spacing issues with previous commits commit 847653b2c9e0e80119766cced69191c46aded246 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 10:46:14 2014 +0000 Update wsgi file to 1.5 compatible commit e49b315f5c1251dc86b8701803066914bf5f421a Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 10:46:04 2014 +0000 Remove bogus changelog lines commit 1f60faad125d7333602c6c7e5dbea7deb193efac Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 10:37:00 2014 +0000 Require python-django15 on rhel6=< fedora 20=< commit c943ce7a968ba5300282d7115dda713b1db94241 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 09:22:34 2014 +0000 Use signed cookies for sessions instead of file This update is a workaround for tests failing when using the file backed session storage. Nevertheless using signed cookies seems more elegant than using tmp folders or session directories which adagios defaulted to using tempfile.gettempdir() since SESSION_FILE_PATH is not set. commit 231b992f0a1eeccf1771e7fe614ac8d958ed96d4 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 09:04:37 2014 +0000 Update travis to pip install Django < 1.6 commit afdacd4f492e26281366bf251da1137648a09338 Author: Tomas Edwardsson <[email protected]> Date: Tue Sep 23 08:27:23 2014 +0000 Django 1.5 compatibility commit 4df4679f94ee8a259dcd38208ea1841ab59de27c Author: petemorgan <[email protected]> Date: Mon Sep 22 17:44:39 2014 -0400 Added support for enable_pnp4nagios flag commit f28f3d7ecdf6b676c6a7909687d9087dfdba2a12 Author: petemorgan <[email protected]> Date: Mon Sep 22 17:43:49 2014 -0400 Added support for enable_pnp4nagios flag commit 84b02b08eef6ad84ff0e796c45b0ba4d18e7c02a Author: petemorgan <[email protected]> Date: Mon Sep 22 17:42:36 2014 -0400 Add support for enable_pnp4nagios flag commit 029f830ca165ac233c4c29ae80a78622f40dcdf0 Author: petemorgan <[email protected]> Date: Mon Sep 22 17:40:09 2014 -0400 Update status_detail.html Support enable_pnp4nagios flag commit 069e0a9aae237c96913ac0c610740ef8a73e67c9 Author: petemorgan <[email protected]> Date: Mon Sep 22 17:39:04 2014 -0400 Update adagios.conf Fix typo in previous commit. commit ecfdde3f8237d8ab3e603489f6f8938fbf3e0a85 Author: petemorgan <[email protected]> Date: Mon Sep 22 17:38:05 2014 -0400 Add enable_pnp4nagios flag commit a07282f5172517c0c5f51b3f0c141a6b48c2d30a Merge: c26f335 3185a54 Author: Pall Sigurdsson <[email protected]> Date: Sun Aug 24 16:04:08 2014 +0200 Merge branch 'master' of github.com:opinkerfi/adagios commit 830dd73d10bb3d0c9f6ccb081b9ebf8fad960018 Author: Pall Sigurdsson <[email protected]> Date: Sat Jul 12 18:10:45 2014 +0200 Unittests - More isolation Fixes travis (hopefully) commit c26f33591848f2bc18371755a96372cf69d475b6 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 18:24:33 2014 +0200 Add: Unit tests for PynagForm Bunch of unit tests and corner cases for the object browser commit ae86623228f1f3c7560f6ac3330efae22f3231a8 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 18:24:02 2014 +0200 Minor improvements to PynagAutoCompleteField commit 7251c8af79d92a9c16fd4f4e246b58048a79ba7f Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 17:38:19 2014 +0200 objectbrowser.edit_object minor cleanup commit 1f4c1f3ca57d4c3dbc36ff5422156b7a7afff707 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 16:44:41 2014 +0200 Fix: PynagForm initial values Fix initial values in PynagForm commit b9a93468fe4bfbd8ac44a12b492dbb6bf13b1736 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 16:43:53 2014 +0200 fix: deprecate most pynagchoicefields Move from using pynagchoicefields to pynag autocomplete fields commit 5d3cd6e76f255e5a99d6a9467697cb541d131b40 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 16:27:32 2014 +0200 add: Javascript stub for autocompletefields This javascript stub turns all input boxes with the css tag pynag-autocomplete commit 70c4a8b471907fcf494eb3dd3ba0e85364767292 Author: Pall Sigurdsson <[email protected]> Date: Sun Jul 6 16:04:05 2014 +0200 add: objectbrowser.forms.PynagAutoCompleteField New field type to replace PynagChoiceField commit d68a6899bfb668f16d3056114081442bf4a684d4 Author: Pall Sigurdsson <[email protected]> Date: Sat Jul 5 20:00:17 2014 +0200 objectbrowser.PynagForm - readability fixes Undo some line breaks for readability sakes commit edf6358d2b319d0f3a2ae0ed91f14bf23e6788ec Author: Pall Sigurdsson <[email protected]> Date: Sat Jul 5 19:57:30 2014 +0200 objectbrowser/PynagChoicefield - error handling commit 984ef86f64de03d8a478b875ef590123a0a293d9 Merge: 8f168c4 4de9e3b Author: Pall Sigurdsson <[email protected]> Date: Sat Jun 28 11:33:41 2014 +0200 Merge branch 'master' of github.com:opinkerfi/adagios commit 8f168c48be7884e3bdc80d55039e28c5c088311c Author: Pall Sigurdsson <[email protected]> Date: Wed May 14 21:54:49 2014 +0200 Fix broken translation strings in copy_object Fixes #381 Conflicts: adagios/templates/base.html
Adds support for selenium browser based testing of /status
The tests are skipped if selenium is not installed.