From 3e2ddc2a43a9bf30acb92732f726ee175090d87c Mon Sep 17 00:00:00 2001 From: Henri Date: Mon, 21 Oct 2024 00:07:50 +0200 Subject: [PATCH 01/11] fix for Windows icon --- build/windows/nagstamon.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/nagstamon.iss b/build/windows/nagstamon.iss index 6a09b639..3cb9c088 100644 --- a/build/windows/nagstamon.iss +++ b/build/windows/nagstamon.iss @@ -27,8 +27,8 @@ ArchitecturesInstallIn64BitMode=x64 CloseApplications=no WizardStyle=modern [Icons] -Name: {group}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\resources\nagstamon.ico; IconIndex: 0 -Name: {commonstartup}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\resources\nagstamon.ico; IconIndex: 0 +Name: {group}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\_internal\resources\nagstamon.ico; IconIndex: 0 +Name: {commonstartup}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\_internal\resources\nagstamon.ico; IconIndex: 0 [Files] Source: "*"; DestDir: {app}; Flags: recursesubdirs createallsubdirs ignoreversion; BeforeInstall: KillRunningNagstamon() [Tasks] From c9cb241b60d077800000ec434647de27bfae4bc3 Mon Sep 17 00:00:00 2001 From: Henri Date: Mon, 21 Oct 2024 00:30:30 +0200 Subject: [PATCH 02/11] fix for Windows icon uninstaller --- build/windows/nagstamon.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/windows/nagstamon.iss b/build/windows/nagstamon.iss index 3cb9c088..96b8f4a4 100644 --- a/build/windows/nagstamon.iss +++ b/build/windows/nagstamon.iss @@ -10,7 +10,7 @@ ShowLanguageDialog=no SetupIconFile=nagstamon.ico UsePreviousGroup=false OutputBaseFilename=Nagstamon-{#version}-win{#arch}_setup -UninstallDisplayIcon={app}\resources\nagstamon.ico +UninstallDisplayIcon={app}\_internal\resources\nagstamon.ico UsePreviousAppDir=false AppID={{44F7CFFB-4776-4DA4-9930-A07178069517} UninstallRestartComputer=false From 297bf8bbb3dd85655de8b765b7c7460b4b33d29b Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Mon, 21 Oct 2024 17:04:27 +0200 Subject: [PATCH 03/11] fix sound problem --- build/debian/changelog | 6 ++++++ build/requirements/macos.txt | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 2a7a5ec8..0cccdf05 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +nagstamon (3.17-20241021) unstable; urgency=low + * New upstream + - fix sound problem + + -- Henri Wahl Mon, Oct 21 2024 08:00:00 +0200 + nagstamon (3.16.1) stable; urgency=low * New upstream - fix ridiculous Windows 11 appearance diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index 1e34e689..e9842b4f 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -5,8 +5,9 @@ lxml psutil pyinstaller pyobjc-framework-ApplicationServices -pyqt6 -pyqt6-qt6 +# since 6.6.0 no sound is available!?! +pyqt6==6.5.3 +pyqt6-qt6==6.5.3 pysocks python-dateutil requests From daa5e216df8d6f3ec375055052eb953df47a7f5f Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:51:14 +0200 Subject: [PATCH 04/11] prepare 3.16.2 --- Nagstamon/Config.py | 2 +- build/debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py index 86a5b8be..0aaa0c7c 100644 --- a/Nagstamon/Config.py +++ b/Nagstamon/Config.py @@ -131,7 +131,7 @@ class AppInfo(object): contains app information previously located in GUI.py """ NAME = 'Nagstamon' - VERSION = '3.17-20241023' + VERSION = '3.16.2' WEBSITE = 'https://nagstamon.de' COPYRIGHT = '©2008-2024 Henri Wahl et al.' COMMENTS = 'Nagios status monitor for your desktop' diff --git a/build/debian/changelog b/build/debian/changelog index e499e501..ba53a1b0 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -nagstamon (3.17-20241023) unstable; urgency=low +nagstamon (3.16.2) unstable; urgency=low * New upstream - fix sound problem - fix IncingaDBWeb From cbe2d9110d358db8d71cd72931b2a1315cd9ac20 Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:56:39 +0200 Subject: [PATCH 05/11] prepare 3.16.2 --- .github/workflows/build-release-latest.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml index 0d46f7e1..62d037be 100644 --- a/.github/workflows/build-release-latest.yml +++ b/.github/workflows/build-release-latest.yml @@ -383,6 +383,12 @@ jobs: pattern: 'fedora*' path: artifact merge-multiple: true + # docker login is needed for pushing the build image + - uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} # organize SSH deploy key for nagstamon-repo - run: mkdir ~/.ssh - run: echo "${{ secrets.NAGSTAMON_REPO_KEY_WEB }}" > ~/.ssh/id_ed25519 @@ -391,6 +397,9 @@ jobs: - run: git clone git@github.com:HenriWahl/nagstamon-jekyll.git - run: rm -rf ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} - run: mkdir -p ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} + # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed + - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . + - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} # copy *.rpm files into nagstamon-jekyll and create repodata - run: | version=${{ env.release }} && \ From 2c0c470d1c6863b0c7ddf0831d7311774962bec9 Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:57:53 +0200 Subject: [PATCH 06/11] prepare 3.16.2 --- .github/workflows/build-release-latest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml index 62d037be..c7d5eb76 100644 --- a/.github/workflows/build-release-latest.yml +++ b/.github/workflows/build-release-latest.yml @@ -397,9 +397,9 @@ jobs: - run: git clone git@github.com:HenriWahl/nagstamon-jekyll.git - run: rm -rf ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} - run: mkdir -p ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} - # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed - - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . - - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} + # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed + - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . + - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} # copy *.rpm files into nagstamon-jekyll and create repodata - run: | version=${{ env.release }} && \ From 898daa50884a8516e209e69eb89216460aadd5fe Mon Sep 17 00:00:00 2001 From: HenriWahl <2835065+HenriWahl@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:59:07 +0200 Subject: [PATCH 07/11] prepare 3.16.2 --- .github/workflows/build-release-latest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml index c7d5eb76..d5c5251f 100644 --- a/.github/workflows/build-release-latest.yml +++ b/.github/workflows/build-release-latest.yml @@ -398,6 +398,7 @@ jobs: - run: rm -rf ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} - run: mkdir -p ${{ env.repo_dir }}/${{ env.family }}/${{ env.release }} # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed + # only needed for fedora - run: docker pull ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} . - run: docker push ${{ env.cr_image }}-${{ env.family }}-${{ env.cr_image_latest }}:${{ env.cr_image_version }} # copy *.rpm files into nagstamon-jekyll and create repodata From 78653d53447f14e19fc11471f358ae7ee76bf8a1 Mon Sep 17 00:00:00 2001 From: Henri Wahl <2835065+HenriWahl@users.noreply.github.com> Date: Sun, 27 Oct 2024 22:17:09 +0100 Subject: [PATCH 08/11] Update nagstamon.appdata.xml Release 3.16.2 --- Nagstamon/resources/nagstamon.appdata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nagstamon/resources/nagstamon.appdata.xml b/Nagstamon/resources/nagstamon.appdata.xml index 31d08a43..9c388429 100644 --- a/Nagstamon/resources/nagstamon.appdata.xml +++ b/Nagstamon/resources/nagstamon.appdata.xml @@ -9,11 +9,11 @@ Nagstamon The status monitor for the desktop - +
    -
  • fix ridiculous Windows 11 appearance
    • -
  • fix Zabbix all information copy action
    • +
  • fix sound problem
    • +
  • fix IncingaDBWeb
 From 5a37b6c0e23f71012565de0d8ec4db3d710620df Mon Sep 17 00:00:00 2001 From: Dregaringo <46315689+Dregaringo@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:05:21 +0200 Subject: [PATCH 09/11] =?UTF-8?q?Fix=20incorrect=20definition=20of=20?= =?UTF-8?q?=E2=80=9Cquote=E2=80=9D=20for=20host=20link=20(#1074)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: resolve double URL encoding issue on macOS * fix: resolve double URL encoding issue on macOS --------- Co-authored-by: Andrii Ivanov Co-authored-by: Henri Wahl <2835065+HenriWahl@users.noreply.github.com> --- Nagstamon/Servers/IcingaDBWeb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nagstamon/Servers/IcingaDBWeb.py b/Nagstamon/Servers/IcingaDBWeb.py index ed4ed023..8340d7c4 100644 --- a/Nagstamon/Servers/IcingaDBWeb.py +++ b/Nagstamon/Servers/IcingaDBWeb.py @@ -744,7 +744,7 @@ def open_monitor(self, host, service=''): url = '{0}/icingadb/hosts?host.state.is_problem=y&sort=host.state.severity#!{1}/icingadb/host?{2}'.format( self.monitor_url, base_path, - urllib.parse.urlencode({'name': self.hosts[host].real_name}, quote_via=quote) + urllib.parse.urlencode({'name': self.hosts[host].real_name}, quote_via=urllib.parse.quote) ) else: # Handle URL for service monitoring From b5f5664584c11fd496ce7aee666261ad7e5be284 Mon Sep 17 00:00:00 2001 From: Hagen Grube Date: Mon, 18 Nov 2024 15:33:43 +0100 Subject: [PATCH 10/11] Update nagstamon.iss (#1079) Warning: Architecture identifier "x64" is deprecated. Substituting "x64os", but note that "x64compatible" is preferred in most cases. See the "Architecture Identifiers" topic in help file for more information. https://jrsoftware.org/ishelp/index.php?topic=archidentifiers --- build/windows/nagstamon.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/windows/nagstamon.iss b/build/windows/nagstamon.iss index 96b8f4a4..80440df9 100644 --- a/build/windows/nagstamon.iss +++ b/build/windows/nagstamon.iss @@ -23,7 +23,7 @@ Compression=lzma SolidCompression=true SourceDir={#source} ArchitecturesAllowed={#archs_allowed} -ArchitecturesInstallIn64BitMode=x64 +ArchitecturesInstallIn64BitMode=x64compatible CloseApplications=no WizardStyle=modern [Icons] From 2fe0aa19e515a1387289bc623d98bfe51b5285d0 Mon Sep 17 00:00:00 2001 From: Henri Wahl <2835065+HenriWahl@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:45:23 +0100 Subject: [PATCH 11/11] 3.16.x back to master (#1080) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update nagstamon.appdata.xml Release 3.16.2 (cherry picked from commit 78653d53447f14e19fc11471f358ae7ee76bf8a1) * Fix incorrect definition of “quote” for host link (#1074) * fix: resolve double URL encoding issue on macOS * fix: resolve double URL encoding issue on macOS --------- Co-authored-by: Andrii Ivanov Co-authored-by: Henri Wahl <2835065+HenriWahl@users.noreply.github.com> (cherry picked from commit 5a37b6c0e23f71012565de0d8ec4db3d710620df) --------- Co-authored-by: Dregaringo <46315689+Dregaringo@users.noreply.github.com>