diff options
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 1 | ||||
-rw-r--r-- | .github/workflows/spellcheck.yml | 1 | ||||
-rw-r--r-- | .github/workflows/test-next.yml | 14 | ||||
-rw-r--r-- | .github/workflows/test.yml | 13 | ||||
-rw-r--r-- | plugins/check_ntp_peer.c | 6 |
5 files changed, 31 insertions, 4 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c402e0cf..e748d2eb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml | |||
@@ -13,6 +13,7 @@ | |||
13 | name: "CodeQL" | 13 | name: "CodeQL" |
14 | 14 | ||
15 | on: | 15 | on: |
16 | workflow_dispatch: {} | ||
16 | push: | 17 | push: |
17 | branches: [master] | 18 | branches: [master] |
18 | pull_request: | 19 | pull_request: |
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml index 72f7c7eb..c8714e64 100644 --- a/.github/workflows/spellcheck.yml +++ b/.github/workflows/spellcheck.yml | |||
@@ -2,6 +2,7 @@ | |||
2 | name: Spellcheck | 2 | name: Spellcheck |
3 | 3 | ||
4 | on: | 4 | on: |
5 | workflow_dispatch: {} | ||
5 | # Run for pushes on any branch | 6 | # Run for pushes on any branch |
6 | push: | 7 | push: |
7 | branches: | 8 | branches: |
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml index fd59e85d..7ca255c9 100644 --- a/.github/workflows/test-next.yml +++ b/.github/workflows/test-next.yml | |||
@@ -2,7 +2,13 @@ | |||
2 | name: Tests Debian:Testing and Fedora:Rawhide | 2 | name: Tests Debian:Testing and Fedora:Rawhide |
3 | 3 | ||
4 | on: | 4 | on: |
5 | workflow_dispatch: {} | 5 | workflow_dispatch: |
6 | inputs: | ||
7 | debug_enabled: | ||
8 | type: boolean | ||
9 | description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' | ||
10 | required: false | ||
11 | default: false | ||
6 | push: | 12 | push: |
7 | branches-ignore: | 13 | branches-ignore: |
8 | - '*' | 14 | - '*' |
@@ -25,6 +31,9 @@ jobs: | |||
25 | steps: | 31 | steps: |
26 | - name: Git clone repository | 32 | - name: Git clone repository |
27 | uses: actions/checkout@v4 | 33 | uses: actions/checkout@v4 |
34 | - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | ||
35 | uses: mxschmitt/action-tmate@v3 | ||
36 | if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} | ||
28 | - name: Run the tests on ${{ matrix.distro }} | 37 | - name: Run the tests on ${{ matrix.distro }} |
29 | run: | | 38 | run: | |
30 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol | 39 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol |
@@ -60,6 +69,9 @@ jobs: | |||
60 | steps: | 69 | steps: |
61 | - name: Git clone repository | 70 | - name: Git clone repository |
62 | uses: actions/checkout@v4 | 71 | uses: actions/checkout@v4 |
72 | - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | ||
73 | uses: mxschmitt/action-tmate@v3 | ||
74 | if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} | ||
63 | - name: Run the tests on ${{ matrix.distro }} | 75 | - name: Run the tests on ${{ matrix.distro }} |
64 | run: | | 76 | run: | |
65 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol | 77 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce0ec547..f9919b2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -2,6 +2,13 @@ | |||
2 | name: Tests | 2 | name: Tests |
3 | 3 | ||
4 | on: | 4 | on: |
5 | workflow_dispatch: | ||
6 | inputs: | ||
7 | debug_enabled: | ||
8 | type: boolean | ||
9 | description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' | ||
10 | required: false | ||
11 | default: false | ||
5 | push: | 12 | push: |
6 | branches: | 13 | branches: |
7 | - '*' | 14 | - '*' |
@@ -22,6 +29,9 @@ jobs: | |||
22 | steps: | 29 | steps: |
23 | - name: Git clone repository | 30 | - name: Git clone repository |
24 | uses: actions/checkout@v4 | 31 | uses: actions/checkout@v4 |
32 | - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | ||
33 | uses: mxschmitt/action-tmate@v3 | ||
34 | if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} | ||
25 | - name: Run the tests on ${{ matrix.distro }} | 35 | - name: Run the tests on ${{ matrix.distro }} |
26 | run: | | 36 | run: | |
27 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol | 37 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol |
@@ -60,6 +70,9 @@ jobs: | |||
60 | steps: | 70 | steps: |
61 | - name: Git clone repository | 71 | - name: Git clone repository |
62 | uses: actions/checkout@v4 | 72 | uses: actions/checkout@v4 |
73 | - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | ||
74 | uses: mxschmitt/action-tmate@v3 | ||
75 | if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} | ||
63 | - name: Run the tests on ${{ matrix.distro }} | 76 | - name: Run the tests on ${{ matrix.distro }} |
64 | run: | | 77 | run: | |
65 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol | 78 | docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 6e76bf23..5c4ff386 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
@@ -707,11 +707,11 @@ int main(int argc, char *argv[]) { | |||
707 | 707 | ||
708 | if (config.do_stratum) { | 708 | if (config.do_stratum) { |
709 | if (sresult == STATE_WARNING) { | 709 | if (sresult == STATE_WARNING) { |
710 | xasprintf(&result_line, "%s, stratum=%l (WARNING)", result_line, ntp_res.stratum); | 710 | xasprintf(&result_line, "%s, stratum=%li (WARNING)", result_line, ntp_res.stratum); |
711 | } else if (sresult == STATE_CRITICAL) { | 711 | } else if (sresult == STATE_CRITICAL) { |
712 | xasprintf(&result_line, "%s, stratum=%l (CRITICAL)", result_line, ntp_res.stratum); | 712 | xasprintf(&result_line, "%s, stratum=%li (CRITICAL)", result_line, ntp_res.stratum); |
713 | } else { | 713 | } else { |
714 | xasprintf(&result_line, "%s, stratum=%l", result_line, ntp_res.stratum); | 714 | xasprintf(&result_line, "%s, stratum=%li", result_line, ntp_res.stratum); |
715 | } | 715 | } |
716 | xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(ntp_res.stratum, config.do_stratum, config.stratum_thresholds)); | 716 | xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(ntp_res.stratum, config.do_stratum, config.stratum_thresholds)); |
717 | } | 717 | } |