-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature_expose_queryhandler
- Loading branch information
Showing
76 changed files
with
3,316 additions
and
781 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: citest | ||
|
|
||
| on: | ||
| push: | ||
| pull_request: | ||
| release: | ||
|
|
||
| jobs: | ||
| citest: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | ||
| # uses: mxschmitt/action-tmate@v3 | ||
| - name: prepare machine | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install apt-transport-https | ||
| sudo sh -c "echo 'deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon:/daily/xUbuntu_$(lsb_release -rs)/ ./' >> /etc/apt/sources.list" | ||
| sudo curl -s -o /etc/apt/trusted.gpg.d/naemon.asc "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" | ||
| sudo apt-get update | ||
| sudo apt-get install autoconf | ||
| sudo apt-get install build-essential | ||
| sudo apt-get install libcppunit-dev | ||
| sudo apt-get install libglib2.0-dev | ||
| sudo apt-get install libtool | ||
| sudo apt-get install naemon-dev | ||
| sudo apt-get install naemon-core | ||
| sudo apt-get install ruby ruby-dev | ||
| sudo apt-get install zlib1g-dev liblzma-dev patch # required for nokogiri | ||
| sudo gem install cucumber:1.3.18 websocket-driver:0.7.0 nokogiri:1.11.0 rack:1.6.5 rack-test:0.7.0 capybara:2.1.0 public_suffix:2.0.5 xpath:2.0 rspec:2.14.1 parallel_tests syntax:1.0.0 cliver:0.3.2 | ||
| - name: run build | ||
| run: | | ||
| autoreconf -i | ||
| ./configure | ||
| make | ||
| - name: run tests | ||
| run: | | ||
| make check || exit 1 | ||
| export PATH="$PATH:$(pwd)/tests/tools" | ||
| export CUKE_UNIXCAT_PATH=$(pwd)/src/unixcat | ||
| export CUKE_LIVESTATUS_PATH=$(pwd)/src/.libs/livestatus.so | ||
| cucumber ./tests -t ~@skip -t ~@unreliable --strict || exit 1 | ||
| LIVESTATUS_TCP=1 cucumber ./tests -t ~@skip -t ~@unreliable --strict || exit 1 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| This is a fork of MK Livestatus, part of Check_MK, that is being maintained | ||
| by naemon. See http://naemon.org to learn more about us. | ||
| by naemon. See https://www.naemon.io to learn more about us. | ||
|
|
||
| Check_MK was invented and implemented by Mathias Kettner | ||
| <[email protected]>. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,7 @@ EXTRA_DIST = naemon-livestatus.spec \ | |
| naemon-livestatus.rpmlintrc \ | ||
| api \ | ||
| debian \ | ||
| version.sh \ | ||
| livestatus.cfg.in | ||
|
|
||
| naemonconf_DATA = livestatus.cfg | ||
|
|
@@ -43,3 +44,16 @@ rpm: dist | |
|
|
||
| deb: | ||
| debuild -i -us -uc -b | ||
|
|
||
| version: | ||
| [ -e .git ] || { echo "changing versions only works in git clones!"; exit 1; } | ||
| [ `git status | grep -cP 'working (directory|tree) clean'` -eq 1 ] || { echo "git project is not clean, cannot tag version"; exit 1; } | ||
| OLDVERSION=$(shell grep ^VERSION version.sh | awk -F = '{ print $$2}'); \ | ||
| NEWVERSION=$$(dialog --stdout --inputbox "New Version:" 0 0 "$$OLDVERSION"); \ | ||
| if [ -n "$$NEWVERSION" ] && [ "$$NEWVERSION" != "$$OLDVERSION" ]; then \ | ||
| sed -ri "s/$$OLDVERSION/$$NEWVERSION/" version.sh naemon-livestatus.spec; \ | ||
| sed -e 's/UNRELEASED/unstable/g' -i debian/changelog; \ | ||
| DEBFULLNAME="Naemon Development Team" DEBEMAIL="Naemon Development <[email protected]>" dch --newversion "$$NEWVERSION" --package "naemon-livestatus" -D "UNRELEASED" --urgency "low" "new upstream release"; \ | ||
| sed -e 's/unstable/UNRELEASED/g' -i debian/changelog; \ | ||
| fi | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,20 @@ | ||
| from livestatus import SingleSiteConnection, MultiSiteConnection, MKLivestatusException, MKLivestatusSocketError, MKLivestatusSocketClosed, MKLivestatusQueryError, MKLivestatusNotFoundError | ||
| from __future__ import absolute_import | ||
| from .livestatus import ( | ||
| SingleSiteConnection, | ||
| MultiSiteConnection, | ||
| MKLivestatusException, | ||
| MKLivestatusSocketError, | ||
| MKLivestatusSocketClosed, | ||
| MKLivestatusQueryError, | ||
| MKLivestatusNotFoundError, | ||
| ) | ||
|
|
||
| __all__ = [ | ||
| 'SingleSiteConnection', | ||
| 'MultiSiteConnection', | ||
| 'MKLivestatusException', | ||
| 'MKLivestatusSocketError', | ||
| 'MKLivestatusSocketClosed', | ||
| 'MKLivestatusQueryError', | ||
| 'MKLivestatusNotFoundError'] | ||
| "SingleSiteConnection", | ||
| "MultiSiteConnection", | ||
| "MKLivestatusException", | ||
| "MKLivestatusSocketError", | ||
| "MKLivestatusSocketClosed", | ||
| "MKLivestatusQueryError", | ||
| "MKLivestatusNotFoundError", | ||
| ] |
Oops, something went wrong.