diff options
author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-06-09 19:12:39 +0200 |
---|---|---|
committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-06-09 19:12:39 +0200 |
commit | 1b4b818b566ca10dd81575f6a6f6c9ebd946ea08 (patch) | |
tree | 835de6ab1487524c0b43ef72188fc84afe4c25cd /modules | |
parent | Merge !1404: tests/dnstap: let Go handle its transitive dependencies (diff) | |
parent | Merge branch 'manager-datamodel-improvements' into 'manager' (diff) | |
download | knot-resolver-1b4b818b566ca10dd81575f6a6f6c9ebd946ea08.tar.xz knot-resolver-1b4b818b566ca10dd81575f6a6f6c9ebd946ea08.zip |
Create branch 6.0 by merging master and manager
Diffstat (limited to 'modules')
103 files changed, 4 insertions, 298 deletions
diff --git a/modules/bogus_log/.packaging/test.config b/modules/bogus_log/.packaging/test.config deleted file mode 100644 index bf1c8219..00000000 --- a/modules/bogus_log/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('bogus_log') -assert(bogus_log) -quit() diff --git a/modules/daf/.packaging/test.config b/modules/daf/.packaging/test.config deleted file mode 100644 index 2fa1d8cb..00000000 --- a/modules/daf/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('daf') -assert(daf) -quit() diff --git a/modules/detect_time_jump/.packaging/test.config b/modules/detect_time_jump/.packaging/test.config deleted file mode 100644 index 7ed0e602..00000000 --- a/modules/detect_time_jump/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('detect_time_jump') -assert(detect_time_jump) -quit() diff --git a/modules/detect_time_skew/.packaging/test.config b/modules/detect_time_skew/.packaging/test.config deleted file mode 100644 index 3a379071..00000000 --- a/modules/detect_time_skew/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('detect_time_skew') -assert(detect_time_skew) -quit() diff --git a/modules/dns64/.packaging/test.config b/modules/dns64/.packaging/test.config deleted file mode 100644 index 5abf524c..00000000 --- a/modules/dns64/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('dns64') -assert(dns64) -quit() diff --git a/modules/dnstap/.packaging/centos/7/builddeps b/modules/dnstap/.packaging/centos/7/builddeps deleted file mode 100644 index d3ab3547..00000000 --- a/modules/dnstap/.packaging/centos/7/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -fstrm-devel -protobuf-c-devel -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/centos/7/rundeps b/modules/dnstap/.packaging/centos/7/rundeps deleted file mode 100644 index 06c2792f..00000000 --- a/modules/dnstap/.packaging/centos/7/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -fstrm -protobuf-c diff --git a/modules/dnstap/.packaging/centos/8/builddeps b/modules/dnstap/.packaging/centos/8/builddeps deleted file mode 100644 index d3ab3547..00000000 --- a/modules/dnstap/.packaging/centos/8/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -fstrm-devel -protobuf-c-devel -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/centos/8/rundeps b/modules/dnstap/.packaging/centos/8/rundeps deleted file mode 100644 index 06c2792f..00000000 --- a/modules/dnstap/.packaging/centos/8/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -fstrm -protobuf-c diff --git a/modules/dnstap/.packaging/debian/10/builddeps b/modules/dnstap/.packaging/debian/10/builddeps deleted file mode 100644 index 417dc04a..00000000 --- a/modules/dnstap/.packaging/debian/10/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -libfstrm-dev -libprotobuf-c-dev -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/debian/10/rundeps b/modules/dnstap/.packaging/debian/10/rundeps deleted file mode 100644 index a726e120..00000000 --- a/modules/dnstap/.packaging/debian/10/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -libfstrm0 -libprotobuf-c1 diff --git a/modules/dnstap/.packaging/debian/9/builddeps b/modules/dnstap/.packaging/debian/9/builddeps deleted file mode 100644 index 417dc04a..00000000 --- a/modules/dnstap/.packaging/debian/9/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -libfstrm-dev -libprotobuf-c-dev -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/debian/9/rundeps b/modules/dnstap/.packaging/debian/9/rundeps deleted file mode 100644 index a726e120..00000000 --- a/modules/dnstap/.packaging/debian/9/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -libfstrm0 -libprotobuf-c1 diff --git a/modules/dnstap/.packaging/fedora/31/builddeps b/modules/dnstap/.packaging/fedora/31/builddeps deleted file mode 100644 index d3ab3547..00000000 --- a/modules/dnstap/.packaging/fedora/31/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -fstrm-devel -protobuf-c-devel -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/fedora/31/rundeps b/modules/dnstap/.packaging/fedora/31/rundeps deleted file mode 100644 index 06c2792f..00000000 --- a/modules/dnstap/.packaging/fedora/31/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -fstrm -protobuf-c diff --git a/modules/dnstap/.packaging/fedora/32/builddeps b/modules/dnstap/.packaging/fedora/32/builddeps deleted file mode 100644 index d3ab3547..00000000 --- a/modules/dnstap/.packaging/fedora/32/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -fstrm-devel -protobuf-c-devel -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/fedora/32/rundeps b/modules/dnstap/.packaging/fedora/32/rundeps deleted file mode 100644 index 06c2792f..00000000 --- a/modules/dnstap/.packaging/fedora/32/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -fstrm -protobuf-c diff --git a/modules/dnstap/.packaging/leap/15.2/builddeps b/modules/dnstap/.packaging/leap/15.2/builddeps deleted file mode 100644 index 30f8d9e1..00000000 --- a/modules/dnstap/.packaging/leap/15.2/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -fstrm-devel -libprotobuf-c-devel -protobuf-c diff --git a/modules/dnstap/.packaging/leap/15.2/rundeps b/modules/dnstap/.packaging/leap/15.2/rundeps deleted file mode 100644 index 06c2792f..00000000 --- a/modules/dnstap/.packaging/leap/15.2/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -fstrm -protobuf-c diff --git a/modules/dnstap/.packaging/test.config b/modules/dnstap/.packaging/test.config deleted file mode 100644 index 5966860f..00000000 --- a/modules/dnstap/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('dnstap') -assert(dnstap) -quit() diff --git a/modules/dnstap/.packaging/ubuntu/16.04/builddeps b/modules/dnstap/.packaging/ubuntu/16.04/builddeps deleted file mode 100644 index 417dc04a..00000000 --- a/modules/dnstap/.packaging/ubuntu/16.04/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -libfstrm-dev -libprotobuf-c-dev -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/ubuntu/16.04/rundeps b/modules/dnstap/.packaging/ubuntu/16.04/rundeps deleted file mode 100644 index a726e120..00000000 --- a/modules/dnstap/.packaging/ubuntu/16.04/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -libfstrm0 -libprotobuf-c1 diff --git a/modules/dnstap/.packaging/ubuntu/18.04/builddeps b/modules/dnstap/.packaging/ubuntu/18.04/builddeps deleted file mode 100644 index 417dc04a..00000000 --- a/modules/dnstap/.packaging/ubuntu/18.04/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -libfstrm-dev -libprotobuf-c-dev -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/ubuntu/18.04/rundeps b/modules/dnstap/.packaging/ubuntu/18.04/rundeps deleted file mode 100644 index a726e120..00000000 --- a/modules/dnstap/.packaging/ubuntu/18.04/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -libfstrm0 -libprotobuf-c1 diff --git a/modules/dnstap/.packaging/ubuntu/20.04/builddeps b/modules/dnstap/.packaging/ubuntu/20.04/builddeps deleted file mode 100644 index 417dc04a..00000000 --- a/modules/dnstap/.packaging/ubuntu/20.04/builddeps +++ /dev/null @@ -1,3 +0,0 @@ -libfstrm-dev -libprotobuf-c-dev -protobuf-c-compiler diff --git a/modules/dnstap/.packaging/ubuntu/20.04/rundeps b/modules/dnstap/.packaging/ubuntu/20.04/rundeps deleted file mode 100644 index a726e120..00000000 --- a/modules/dnstap/.packaging/ubuntu/20.04/rundeps +++ /dev/null @@ -1,2 +0,0 @@ -libfstrm0 -libprotobuf-c1 diff --git a/modules/edns_keepalive/.packaging/test.config b/modules/edns_keepalive/.packaging/test.config deleted file mode 100644 index 5c71c797..00000000 --- a/modules/edns_keepalive/.packaging/test.config +++ /dev/null @@ -1,10 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('edns_keepalive') - -for _,item in ipairs(modules.list()) do - if item == "edns_keepalive" then - os.exit(0) - end -end - -os.exit(1) diff --git a/modules/etcd/.packaging/centos/7/pre-test.sh b/modules/etcd/.packaging/centos/7/pre-test.sh deleted file mode 100755 index 4df79d99..00000000 --- a/modules/etcd/.packaging/centos/7/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/centos/7/rundeps b/modules/etcd/.packaging/centos/7/rundeps deleted file mode 100644 index 795a3c44..00000000 --- a/modules/etcd/.packaging/centos/7/rundeps +++ /dev/null @@ -1,6 +0,0 @@ -openssl-devel -lua-devel -luarocks -git -gcc -make diff --git a/modules/etcd/.packaging/centos/8/NOTSUPPORTED b/modules/etcd/.packaging/centos/8/NOTSUPPORTED deleted file mode 100644 index e69de29b..00000000 --- a/modules/etcd/.packaging/centos/8/NOTSUPPORTED +++ /dev/null diff --git a/modules/etcd/.packaging/debian/10/pre-test.sh b/modules/etcd/.packaging/debian/10/pre-test.sh deleted file mode 100755 index 20073dc8..00000000 --- a/modules/etcd/.packaging/debian/10/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/debian/10/rundeps b/modules/etcd/.packaging/debian/10/rundeps deleted file mode 100644 index 02d3fcf5..00000000 --- a/modules/etcd/.packaging/debian/10/rundeps +++ /dev/null @@ -1,4 +0,0 @@ -libssl-dev -luarocks -git -make diff --git a/modules/etcd/.packaging/debian/9/pre-test.sh b/modules/etcd/.packaging/debian/9/pre-test.sh deleted file mode 100755 index 4df79d99..00000000 --- a/modules/etcd/.packaging/debian/9/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/debian/9/rundeps b/modules/etcd/.packaging/debian/9/rundeps deleted file mode 100644 index 02d3fcf5..00000000 --- a/modules/etcd/.packaging/debian/9/rundeps +++ /dev/null @@ -1,4 +0,0 @@ -libssl-dev -luarocks -git -make diff --git a/modules/etcd/.packaging/fedora/31/NOTSUPPORTED b/modules/etcd/.packaging/fedora/31/NOTSUPPORTED deleted file mode 100644 index b912289a..00000000 --- a/modules/etcd/.packaging/fedora/31/NOTSUPPORTED +++ /dev/null @@ -1,16 +0,0 @@ -Error installing etcd using luarocks: - - - -Missing dependencies for process 1.9.0-1: - luarocks-fetch-gitrec >= 0.2 (not installed) - -process 1.9.0-1 depends on luarocks-fetch-gitrec >= 0.2 (not installed) -Installing https://luarocks.org/luarocks-fetch-gitrec-0.2-1.src.rock - -No existing manifest. Attempting to rebuild... -luarocks-fetch-gitrec 0.2-1 is now installed in /root/.luarocks (license: MIT) - - -Error: Unknown protocol gitrec - diff --git a/modules/etcd/.packaging/fedora/32/NOTSUPPORTED b/modules/etcd/.packaging/fedora/32/NOTSUPPORTED deleted file mode 100644 index b912289a..00000000 --- a/modules/etcd/.packaging/fedora/32/NOTSUPPORTED +++ /dev/null @@ -1,16 +0,0 @@ -Error installing etcd using luarocks: - - - -Missing dependencies for process 1.9.0-1: - luarocks-fetch-gitrec >= 0.2 (not installed) - -process 1.9.0-1 depends on luarocks-fetch-gitrec >= 0.2 (not installed) -Installing https://luarocks.org/luarocks-fetch-gitrec-0.2-1.src.rock - -No existing manifest. Attempting to rebuild... -luarocks-fetch-gitrec 0.2-1 is now installed in /root/.luarocks (license: MIT) - - -Error: Unknown protocol gitrec - diff --git a/modules/etcd/.packaging/leap/15.2/pre-test.sh b/modules/etcd/.packaging/leap/15.2/pre-test.sh deleted file mode 100755 index 20073dc8..00000000 --- a/modules/etcd/.packaging/leap/15.2/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/leap/15.2/rundeps b/modules/etcd/.packaging/leap/15.2/rundeps deleted file mode 100644 index e8df59ba..00000000 --- a/modules/etcd/.packaging/leap/15.2/rundeps +++ /dev/null @@ -1,6 +0,0 @@ -libopenssl-devel -lua51-devel -lua51-luarocks -git -gcc -make diff --git a/modules/etcd/.packaging/test.config b/modules/etcd/.packaging/test.config deleted file mode 100644 index 1cc7e5aa..00000000 --- a/modules/etcd/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('etcd') -assert(etcd) -quit() diff --git a/modules/etcd/.packaging/ubuntu/16.04/pre-test.sh b/modules/etcd/.packaging/ubuntu/16.04/pre-test.sh deleted file mode 100755 index 4df79d99..00000000 --- a/modules/etcd/.packaging/ubuntu/16.04/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/ubuntu/16.04/rundeps b/modules/etcd/.packaging/ubuntu/16.04/rundeps deleted file mode 100644 index a355a9f8..00000000 --- a/modules/etcd/.packaging/ubuntu/16.04/rundeps +++ /dev/null @@ -1,3 +0,0 @@ -libssl-dev -luarocks -git diff --git a/modules/etcd/.packaging/ubuntu/18.04/pre-test.sh b/modules/etcd/.packaging/ubuntu/18.04/pre-test.sh deleted file mode 100755 index 4df79d99..00000000 --- a/modules/etcd/.packaging/ubuntu/18.04/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/ubuntu/18.04/rundeps b/modules/etcd/.packaging/ubuntu/18.04/rundeps deleted file mode 100644 index a355a9f8..00000000 --- a/modules/etcd/.packaging/ubuntu/18.04/rundeps +++ /dev/null @@ -1,3 +0,0 @@ -libssl-dev -luarocks -git diff --git a/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh b/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh deleted file mode 100755 index 20073dc8..00000000 --- a/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/ubuntu/20.04/rundeps b/modules/etcd/.packaging/ubuntu/20.04/rundeps deleted file mode 100644 index 02d3fcf5..00000000 --- a/modules/etcd/.packaging/ubuntu/20.04/rundeps +++ /dev/null @@ -1,4 +0,0 @@ -libssl-dev -luarocks -git -make diff --git a/modules/experimental_dot_auth/.packaging/centos/7/rundeps b/modules/experimental_dot_auth/.packaging/centos/7/rundeps deleted file mode 100644 index 36b83e18..00000000 --- a/modules/experimental_dot_auth/.packaging/centos/7/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-basexx diff --git a/modules/experimental_dot_auth/.packaging/centos/8/rundeps b/modules/experimental_dot_auth/.packaging/centos/8/rundeps deleted file mode 100644 index 984c7cec..00000000 --- a/modules/experimental_dot_auth/.packaging/centos/8/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-basexx diff --git a/modules/experimental_dot_auth/.packaging/debian/10/rundeps b/modules/experimental_dot_auth/.packaging/debian/10/rundeps deleted file mode 100644 index 36b83e18..00000000 --- a/modules/experimental_dot_auth/.packaging/debian/10/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-basexx diff --git a/modules/experimental_dot_auth/.packaging/debian/9/rundeps b/modules/experimental_dot_auth/.packaging/debian/9/rundeps deleted file mode 100644 index 36b83e18..00000000 --- a/modules/experimental_dot_auth/.packaging/debian/9/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-basexx diff --git a/modules/experimental_dot_auth/.packaging/fedora/31/rundeps b/modules/experimental_dot_auth/.packaging/fedora/31/rundeps deleted file mode 100644 index 984c7cec..00000000 --- a/modules/experimental_dot_auth/.packaging/fedora/31/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-basexx diff --git a/modules/experimental_dot_auth/.packaging/fedora/32/rundeps b/modules/experimental_dot_auth/.packaging/fedora/32/rundeps deleted file mode 100644 index 984c7cec..00000000 --- a/modules/experimental_dot_auth/.packaging/fedora/32/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-basexx diff --git a/modules/experimental_dot_auth/.packaging/leap/15.2/NOTSUPPORTED b/modules/experimental_dot_auth/.packaging/leap/15.2/NOTSUPPORTED deleted file mode 100644 index 682eff05..00000000 --- a/modules/experimental_dot_auth/.packaging/leap/15.2/NOTSUPPORTED +++ /dev/null @@ -1,6 +0,0 @@ - -ERROR:test_packaging:Installing https://luarocks.org/basexx-0.4.1-1.rockspec -Error: Failed extracting v0.4.1.tar.gz - -Doesn't works on GitLab CI/CD, but works on localhost. -gzip and tar packages are installed, all packages has same version as packages on localhost's docker container. diff --git a/modules/experimental_dot_auth/.packaging/leap/15.2/pre-test.sh b/modules/experimental_dot_auth/.packaging/leap/15.2/pre-test.sh deleted file mode 100755 index df5d7845..00000000 --- a/modules/experimental_dot_auth/.packaging/leap/15.2/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install basexx --from=https://mah0x211.github.io/rocks/ diff --git a/modules/experimental_dot_auth/.packaging/leap/15.2/rundeps b/modules/experimental_dot_auth/.packaging/leap/15.2/rundeps deleted file mode 100644 index 9e636d84..00000000 --- a/modules/experimental_dot_auth/.packaging/leap/15.2/rundeps +++ /dev/null @@ -1,4 +0,0 @@ -lua51-luarocks -git -tar -gzip diff --git a/modules/experimental_dot_auth/.packaging/test.config b/modules/experimental_dot_auth/.packaging/test.config deleted file mode 100644 index 39e9aed8..00000000 --- a/modules/experimental_dot_auth/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('experimental_dot_auth') -assert(experimental_dot_auth) -quit() diff --git a/modules/experimental_dot_auth/.packaging/ubuntu/16.04/NOTSUPPORTED b/modules/experimental_dot_auth/.packaging/ubuntu/16.04/NOTSUPPORTED deleted file mode 100644 index e69de29b..00000000 --- a/modules/experimental_dot_auth/.packaging/ubuntu/16.04/NOTSUPPORTED +++ /dev/null diff --git a/modules/experimental_dot_auth/.packaging/ubuntu/18.04/rundeps b/modules/experimental_dot_auth/.packaging/ubuntu/18.04/rundeps deleted file mode 100644 index 36b83e18..00000000 --- a/modules/experimental_dot_auth/.packaging/ubuntu/18.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-basexx diff --git a/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps b/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps deleted file mode 100644 index 36b83e18..00000000 --- a/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-basexx diff --git a/modules/graphite/.packaging/centos/7/rundeps b/modules/graphite/.packaging/centos/7/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/centos/7/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/graphite/.packaging/centos/8/rundeps b/modules/graphite/.packaging/centos/8/rundeps deleted file mode 100644 index 182251d9..00000000 --- a/modules/graphite/.packaging/centos/8/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-cqueues diff --git a/modules/graphite/.packaging/debian/10/rundeps b/modules/graphite/.packaging/debian/10/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/debian/10/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/graphite/.packaging/debian/9/rundeps b/modules/graphite/.packaging/debian/9/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/debian/9/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/graphite/.packaging/fedora/31/rundeps b/modules/graphite/.packaging/fedora/31/rundeps deleted file mode 100644 index 182251d9..00000000 --- a/modules/graphite/.packaging/fedora/31/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-cqueues diff --git a/modules/graphite/.packaging/fedora/32/rundeps b/modules/graphite/.packaging/fedora/32/rundeps deleted file mode 100644 index 182251d9..00000000 --- a/modules/graphite/.packaging/fedora/32/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-cqueues diff --git a/modules/graphite/.packaging/leap/15.2/NOTSUPPORTED b/modules/graphite/.packaging/leap/15.2/NOTSUPPORTED deleted file mode 100644 index b1ae77d0..00000000 --- a/modules/graphite/.packaging/leap/15.2/NOTSUPPORTED +++ /dev/null @@ -1,6 +0,0 @@ - -ERROR:test_packaging:Installing https://luarocks.org/cqueues-20190813.51-0.src.rock -164 Error: Failed extracting rel-20190813.tar.gz - -Doesn't works on GitLab CI/CD, but works on localhost. -gzip and tar packages are installed, all packages has same version as packages on localhost's docker container. diff --git a/modules/graphite/.packaging/leap/15.2/pre-test.sh b/modules/graphite/.packaging/leap/15.2/pre-test.sh deleted file mode 100755 index 9614066a..00000000 --- a/modules/graphite/.packaging/leap/15.2/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install cqueues --from=https://mah0x211.github.io/rocks/ diff --git a/modules/graphite/.packaging/leap/15.2/rundeps b/modules/graphite/.packaging/leap/15.2/rundeps deleted file mode 100644 index 83238871..00000000 --- a/modules/graphite/.packaging/leap/15.2/rundeps +++ /dev/null @@ -1,6 +0,0 @@ -libopenssl-devel -lua51-luarocks -git -tar -gzip -m4 diff --git a/modules/graphite/.packaging/test.config b/modules/graphite/.packaging/test.config deleted file mode 100644 index c23033b1..00000000 --- a/modules/graphite/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('graphite') -assert(graphite) -quit() diff --git a/modules/graphite/.packaging/ubuntu/16.04/rundeps b/modules/graphite/.packaging/ubuntu/16.04/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/ubuntu/16.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/graphite/.packaging/ubuntu/18.04/rundeps b/modules/graphite/.packaging/ubuntu/18.04/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/ubuntu/18.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/graphite/.packaging/ubuntu/20.04/rundeps b/modules/graphite/.packaging/ubuntu/20.04/rundeps deleted file mode 100644 index 3da806bd..00000000 --- a/modules/graphite/.packaging/ubuntu/20.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-cqueues diff --git a/modules/hints/.packaging/test.config b/modules/hints/.packaging/test.config deleted file mode 100644 index d89c7f0c..00000000 --- a/modules/hints/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('hints') -assert(hints) -quit() diff --git a/modules/http/.packaging/centos/7/rundeps b/modules/http/.packaging/centos/7/rundeps deleted file mode 100644 index c557cb28..00000000 --- a/modules/http/.packaging/centos/7/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-http diff --git a/modules/http/.packaging/centos/8/rundeps b/modules/http/.packaging/centos/8/rundeps deleted file mode 100644 index ed5aee15..00000000 --- a/modules/http/.packaging/centos/8/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-http diff --git a/modules/http/.packaging/debian/10/rundeps b/modules/http/.packaging/debian/10/rundeps deleted file mode 100644 index c557cb28..00000000 --- a/modules/http/.packaging/debian/10/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-http diff --git a/modules/http/.packaging/debian/9/rundeps b/modules/http/.packaging/debian/9/rundeps deleted file mode 100644 index c557cb28..00000000 --- a/modules/http/.packaging/debian/9/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-http diff --git a/modules/http/.packaging/fedora/31/rundeps b/modules/http/.packaging/fedora/31/rundeps deleted file mode 100644 index ed5aee15..00000000 --- a/modules/http/.packaging/fedora/31/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-http diff --git a/modules/http/.packaging/fedora/32/rundeps b/modules/http/.packaging/fedora/32/rundeps deleted file mode 100644 index ed5aee15..00000000 --- a/modules/http/.packaging/fedora/32/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua5.1-http diff --git a/modules/http/.packaging/leap/15.2/NOTSUPPORTED b/modules/http/.packaging/leap/15.2/NOTSUPPORTED deleted file mode 100644 index bb50260c..00000000 --- a/modules/http/.packaging/leap/15.2/NOTSUPPORTED +++ /dev/null @@ -1,5 +0,0 @@ - -https://github.com/wahern/luaossl/issues/175 - - -Doesn't work with libopenssl-devel 1.1.0i-lp151.1.1 diff --git a/modules/http/.packaging/leap/15.2/pre-test.sh b/modules/http/.packaging/leap/15.2/pre-test.sh deleted file mode 100755 index bb1e1311..00000000 --- a/modules/http/.packaging/leap/15.2/pre-test.sh +++ /dev/null @@ -1 +0,0 @@ -luarocks --lua-version 5.1 install http --from=https://mah0x211.github.io/rocks/ diff --git a/modules/http/.packaging/leap/15.2/rundeps b/modules/http/.packaging/leap/15.2/rundeps deleted file mode 100644 index ab051889..00000000 --- a/modules/http/.packaging/leap/15.2/rundeps +++ /dev/null @@ -1,7 +0,0 @@ -libopenssl-devel -lua51-devel -lua51-luarocks -git -tar -gzip -m4 diff --git a/modules/http/.packaging/test.config b/modules/http/.packaging/test.config deleted file mode 100644 index cb5e5dd5..00000000 --- a/modules/http/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('http') -assert(http) -quit() diff --git a/modules/http/.packaging/ubuntu/16.04/NOTSUPPORTED b/modules/http/.packaging/ubuntu/16.04/NOTSUPPORTED deleted file mode 100644 index e69de29b..00000000 --- a/modules/http/.packaging/ubuntu/16.04/NOTSUPPORTED +++ /dev/null diff --git a/modules/http/.packaging/ubuntu/18.04/rundeps b/modules/http/.packaging/ubuntu/18.04/rundeps deleted file mode 100644 index c557cb28..00000000 --- a/modules/http/.packaging/ubuntu/18.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-http diff --git a/modules/http/.packaging/ubuntu/20.04/rundeps b/modules/http/.packaging/ubuntu/20.04/rundeps deleted file mode 100644 index c557cb28..00000000 --- a/modules/http/.packaging/ubuntu/20.04/rundeps +++ /dev/null @@ -1 +0,0 @@ -lua-http diff --git a/modules/nsid/.packaging/test.config b/modules/nsid/.packaging/test.config deleted file mode 100644 index de54cceb..00000000 --- a/modules/nsid/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('nsid') -assert(nsid) -quit() diff --git a/modules/policy/.packaging/test.config b/modules/policy/.packaging/test.config deleted file mode 100644 index 60c9ddc0..00000000 --- a/modules/policy/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('policy') -assert(policy) -quit() diff --git a/modules/predict/.packaging/test.config b/modules/predict/.packaging/test.config deleted file mode 100644 index b8e706e3..00000000 --- a/modules/predict/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('predict') -assert(predict) -quit() diff --git a/modules/prefill/.packaging/test.config b/modules/prefill/.packaging/test.config deleted file mode 100644 index d0258b02..00000000 --- a/modules/prefill/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('prefill') -assert(prefill) -quit() diff --git a/modules/priming/.packaging/test.config b/modules/priming/.packaging/test.config deleted file mode 100644 index 63239f07..00000000 --- a/modules/priming/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('priming') -assert(priming) -quit() diff --git a/modules/rebinding/.packaging/test.config b/modules/rebinding/.packaging/test.config deleted file mode 100644 index 0a84b88b..00000000 --- a/modules/rebinding/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('rebinding') -assert(rebinding) -quit() diff --git a/modules/refuse_nord/.packaging/test.config b/modules/refuse_nord/.packaging/test.config deleted file mode 100644 index 8679e269..00000000 --- a/modules/refuse_nord/.packaging/test.config +++ /dev/null @@ -1,3 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -assert(modules.load('refuse_nord') == true) -quit() diff --git a/modules/renumber/.packaging/test.config b/modules/renumber/.packaging/test.config deleted file mode 100644 index 37f136ab..00000000 --- a/modules/renumber/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('renumber') -assert(renumber) -quit() diff --git a/modules/serve_stale/.packaging/test.config b/modules/serve_stale/.packaging/test.config deleted file mode 100644 index 362c4ec8..00000000 --- a/modules/serve_stale/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('serve_stale') -assert(serve_stale) -quit() diff --git a/modules/stats/.packaging/test.config b/modules/stats/.packaging/test.config deleted file mode 100644 index fd25460d..00000000 --- a/modules/stats/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('stats') -assert(stats) -quit() diff --git a/modules/stats/README.rst b/modules/stats/README.rst index 7d423aa8..014c9f06 100644 --- a/modules/stats/README.rst +++ b/modules/stats/README.rst @@ -89,6 +89,8 @@ Built-in counters keep track of number of queries and answers matching specific +-----------------+----------------------------------+ | answer.slow | completed in more than 1500ms | +-----------------+----------------------------------+ +| answer.sum_ms | sum of all latencies in ms | ++-----------------+----------------------------------+ +-----------------+----------------------------------+ | **Answer flags** | diff --git a/modules/stats/stats.c b/modules/stats/stats.c index ebb28778..ca3a932c 100644 --- a/modules/stats/stats.c +++ b/modules/stats/stats.c @@ -42,6 +42,7 @@ X(answer,total) X(answer,noerror) X(answer,nodata) X(answer,nxdomain) X(answer,servfail) \ X(answer,cached) X(answer,1ms) X(answer,10ms) X(answer,50ms) X(answer,100ms) \ X(answer,250ms) X(answer,500ms) X(answer,1000ms) X(answer,1500ms) X(answer,slow) \ + X(answer,sum_ms) \ X(answer,aa) X(answer,tc) X(answer,rd) X(answer,ra) X(answer, ad) X(answer,cd) \ X(answer,edns0) X(answer,do) \ X(query,edns) X(query,dnssec) \ @@ -220,6 +221,7 @@ static int collect(kr_layer_t *ctx) /* Histogram of answer latency. */ struct kr_query *first = rplan->resolved.at[0]; uint64_t elapsed = kr_now() - first->timestamp_mono; + stat_const_add(data, metric_answer_sum_ms, elapsed); if (elapsed <= 1) { stat_const_add(data, metric_answer_1ms, 1); } else if (elapsed <= 10) { diff --git a/modules/ta_sentinel/.packaging/test.config b/modules/ta_sentinel/.packaging/test.config deleted file mode 100644 index 4bb6ac9a..00000000 --- a/modules/ta_sentinel/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('ta_sentinel') -assert(ta_sentinel) -quit() diff --git a/modules/ta_signal_query/.packaging/test.config b/modules/ta_signal_query/.packaging/test.config deleted file mode 100644 index dfa7c2a5..00000000 --- a/modules/ta_signal_query/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('ta_signal_query') -assert(ta_signal_query) -quit() diff --git a/modules/ta_update/.packaging/test.config b/modules/ta_update/.packaging/test.config deleted file mode 100644 index 5fe55875..00000000 --- a/modules/ta_update/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('ta_update') -assert(ta_update) -quit() diff --git a/modules/view/.packaging/test.config b/modules/view/.packaging/test.config deleted file mode 100644 index b639fdaf..00000000 --- a/modules/view/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('view') -assert(view) -quit() diff --git a/modules/watchdog/.packaging/test.config b/modules/watchdog/.packaging/test.config deleted file mode 100644 index 9d1a291c..00000000 --- a/modules/watchdog/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('watchdog') -assert(watchdog) -quit() diff --git a/modules/workarounds/.packaging/test.config b/modules/workarounds/.packaging/test.config deleted file mode 100644 index c420810b..00000000 --- a/modules/workarounds/.packaging/test.config +++ /dev/null @@ -1,4 +0,0 @@ --- SPDX-License-Identifier: GPL-3.0-or-later -modules.load('workarounds') -assert(workarounds) -quit() |