diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
| commit | 105ad30a29266eafedd8ef79bc21218b92415907 (patch) | |
| tree | ca61c4aec3a3feceef50a88e5d125bbb2621ad3a | |
| parent | Releasing debian version 1.30.0-1. (diff) | |
| download | netdata-105ad30a29266eafedd8ef79bc21218b92415907.tar.xz netdata-105ad30a29266eafedd8ef79bc21218b92415907.zip | |
Merging upstream version 1.30.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
48 files changed, 152 insertions, 131 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5d0484c7e..185ececd2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,16 +5,16 @@ * @ktsaou @Ferroin # Ownership by directory structure -.travis/ @Ferroin @knatsakis @kaskavel @vkalintiris -.github/ @Ferroin @knatsakis @kaskavel @vkalintiris +.travis/ @Ferroin @kaskavel @vkalintiris +.github/ @Ferroin @kaskavel @vkalintiris aclk/ @stelfrag @underhood backends/ @thiagoftsm @vlvkobal backends/graphite/ @thiagoftsm @vlvkobal backends/json/ @thiagoftsm @vlvkobal backends/opentsdb/ @thiagoftsm @vlvkobal backends/prometheus/ @vlvkobal @thiagoftsm -build/ @Ferroin @knatsakis -contrib/debian @Ferroin @knatsakis @vkalintiris +build/ @Ferroin +contrib/debian @Ferroin @vkalintiris collectors/ @vlvkobal @mfundul collectors/charts.d.plugin/ @ilyam8 @Ferroin collectors/freebsd.plugin/ @vlvkobal @thiagoftsm @@ -34,11 +34,11 @@ health/ @thiagoftsm @vlvkobal health/health.d/ @thiagoftsm @vlvkobal health/notifications/ @Ferroin @thiagoftsm libnetdata/ @thiagofsm @mfundul -packaging/ @Ferroin @knatsakis @vkalintiris +packaging/ @Ferroin @vkalintiris registry/ @jacekkolasa streaming/ @thiagoftsm @vlvkobal -system/ @Ferroin @knatsakis @vkalintiris -tests/ @Ferroin @knatsakis @kaskavel +system/ @Ferroin @vkalintiris +tests/ @Ferroin @kaskavel web/ @thiagoftsm @mfundul @vlvkobal web/gui/ @jacekkolasa diff --git a/.github/scripts/old_package_purging.sh b/.github/scripts/old_package_purging.sh index c90c4b780..727a1c256 100755 --- a/.github/scripts/old_package_purging.sh +++ b/.github/scripts/old_package_purging.sh @@ -2,7 +2,7 @@ # # Script to handle package cloud retention policy # Our open source subscription is limited, -# so we use this sript to control the number of packages maintained historically +# so we use this script to control the number of packages maintained historically # # Dependencies: # - PACKAGE_CLOUD_RETENTION_DAYS diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 7340c27bb..a0315430e 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -121,6 +121,7 @@ jobs: run: | echo "Packages to upload:\n$(ls artifacts/*.${{ matrix.format }})" for pkgfile in artifacts/*.${{ matrix.format }} ; do + .github/scripts/package_cloud_wrapper.sh yank ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile} || true .github/scripts/package_cloud_wrapper.sh push ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile} done - name: Clean diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c166c7442..171bf0bb9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata-all sudo apt-get install -y libjson-c-dev libipmimonitoring-dev libcups2-dev libsnappy-dev \ libprotobuf-dev libprotoc-dev libssl-dev protobuf-compiler \ - libnetfilter-acct-dev libmongoc-dev libcmocka-dev + libnetfilter-acct-dev libmongoc-dev libcmocka-dev libzstd-dev - name: Configure run: | autoreconf -ivf diff --git a/.travis.yml b/.travis.yml index d5cf8ea10..747168288 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ install: # These are release-related artifacts and have to be evaluated before we start doing conditional checks inside stages - source ".travis/tagger.sh" - export GIT_TAG="$(git tag --points-at)" + - git submodule update --init --recursive # Setup notification system diff --git a/.travis/check_changelog_last_modification.sh b/.travis/check_changelog_last_modification.sh index d6f8a1639..ae0da877b 100755 --- a/.travis/check_changelog_last_modification.sh +++ b/.travis/check_changelog_last_modification.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# This scriptplet validates nightlies age and notifies is if it gets too old +# This scriptlet validates nightlies age and notifies is if it gets too old # # Copyright: SPDX-License-Identifier: GPL-3.0-or-later # diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh index 32b9a0bb7..a5349cca3 100755 --- a/.travis/create_artifacts.sh +++ b/.travis/create_artifacts.sh @@ -3,7 +3,7 @@ # Artifacts creation script. # This script generates two things: # 1) The static binary that can run on all linux distros (built-in dependencies etc) -# 2) The distribution source tarbal +# 2) The distribution source tarball # # Copyright: SPDX-License-Identifier: GPL-3.0-or-later # diff --git a/.travis/nightlies.sh b/.travis/nightlies.sh index e60ee2797..7240a784d 100755 --- a/.travis/nightlies.sh +++ b/.travis/nightlies.sh @@ -29,7 +29,7 @@ PREVIOUS_NIGHTLY_COUNT="$(rev <packaging/version | cut -d- -f 2 | rev)" # If no commits since release, just stop if [ "${COMMITS_SINCE_RELEASE}" == "${PREVIOUS_NIGHTLY_COUNT}" ]; then - echo "No changes since last nighthly release, nothing else to do" + echo "No changes since last nightly release, nothing else to do" exit 0 fi diff --git a/CHANGELOG.md b/CHANGELOG.md index c574ec6d3..e0316c688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [v1.30.1](https://github.com/netdata/netdata/tree/v1.30.1) (2021-04-12) + +[Full Changelog](https://github.com/netdata/netdata/compare/v1.30.0...v1.30.1) + +**Merged pull requests:** + +- Don’t use glob expansion in argument to `cd` in updater. [\#10936](https://github.com/netdata/netdata/pull/10936) ([Ferroin](https://github.com/Ferroin)) +- Fix memory corruption issue when executing context queries in RAM/SAVE memory mode [\#10933](https://github.com/netdata/netdata/pull/10933) ([stelfrag](https://github.com/stelfrag)) +- Update CODEOWNERS [\#10928](https://github.com/netdata/netdata/pull/10928) ([knatsakis](https://github.com/knatsakis)) +- Update news and GIF in README, fix typo [\#10900](https://github.com/netdata/netdata/pull/10900) ([joelhans](https://github.com/joelhans)) +- Update README.md [\#10898](https://github.com/netdata/netdata/pull/10898) ([slimanio](https://github.com/slimanio)) +- Fixed bundling of ACLK-NG components in dist tarballs. [\#10894](https://github.com/netdata/netdata/pull/10894) ([Ferroin](https://github.com/Ferroin)) +- Add a CRASH event when the agent fails to properly shutdown [\#10893](https://github.com/netdata/netdata/pull/10893) ([stelfrag](https://github.com/stelfrag)) +- Bumped version of OpenSSL bundled in static builds to 1.1.1k. [\#10884](https://github.com/netdata/netdata/pull/10884) ([Ferroin](https://github.com/Ferroin)) +- Fix incorrect health log entries [\#10822](https://github.com/netdata/netdata/pull/10822) ([stelfrag](https://github.com/stelfrag)) +- Spelling build [\#10428](https://github.com/netdata/netdata/pull/10428) ([jsoref](https://github.com/jsoref)) + ## [v1.30.0](https://github.com/netdata/netdata/tree/v1.30.0) (2021-03-31) [Full Changelog](https://github.com/netdata/netdata/compare/v1.29.3...v1.30.0) @@ -240,7 +257,6 @@ - Docs housekeeping for SEO and syntax, part 1 [\#10388](https://github.com/netdata/netdata/pull/10388) ([joelhans](https://github.com/joelhans)) - Persist `$TMPDIR` from installer to updater. [\#10384](https://github.com/netdata/netdata/pull/10384) ([Ferroin](https://github.com/Ferroin)) - Change linting standard for Markdown lists [\#10371](https://github.com/netdata/netdata/pull/10371) ([joelhans](https://github.com/joelhans)) -- Move ACLK Legacy into subfolder [\#10265](https://github.com/netdata/netdata/pull/10265) ([underhood](https://github.com/underhood)) ## [v1.27.0_0104103941](https://github.com/netdata/netdata/tree/v1.27.0_0104103941) (2021-01-04) @@ -306,30 +322,6 @@ - python.d/nvidia\_smi: fix gpu data filtering [\#10312](https://github.com/netdata/netdata/pull/10312) ([ilyam8](https://github.com/ilyam8)) - Add new collectors to supported collectors list [\#10310](https://github.com/netdata/netdata/pull/10310) ([joelhans](https://github.com/joelhans)) - Added numerous improvements to our Docker image. [\#10308](https://github.com/netdata/netdata/pull/10308) ([Ferroin](https://github.com/Ferroin)) -- Update README.md [\#10303](https://github.com/netdata/netdata/pull/10303) ([ktsaou](https://github.com/ktsaou)) -- Add optional info on how to also add some default alarms as part of s… [\#10302](https://github.com/netdata/netdata/pull/10302) ([andrewm4894](https://github.com/andrewm4894)) -- Update UPDATE.md [\#10301](https://github.com/netdata/netdata/pull/10301) ([ysamouhos](https://github.com/ysamouhos)) -- HAProxy spelling correction [\#10300](https://github.com/netdata/netdata/pull/10300) ([autoalan](https://github.com/autoalan)) -- eBPF synchronization [\#10299](https://github.com/netdata/netdata/pull/10299) ([thiagoftsm](https://github.com/thiagoftsm)) -- python.d: always create a runtime chart on `create` call [\#10296](https://github.com/netdata/netdata/pull/10296) ([ilyam8](https://github.com/ilyam8)) -- Update macOS instructions with cmake [\#10295](https://github.com/netdata/netdata/pull/10295) ([joelhans](https://github.com/joelhans)) -- dbengine extent cache [\#10293](https://github.com/netdata/netdata/pull/10293) ([mfundul](https://github.com/mfundul)) -- add privacy information about aclk connection [\#10292](https://github.com/netdata/netdata/pull/10292) ([OdysLam](https://github.com/OdysLam)) -- Fixed the data endpoint so that the context param is correctly applied to children [\#10290](https://github.com/netdata/netdata/pull/10290) ([stelfrag](https://github.com/stelfrag)) -- installer: update go.d.plugin version to v0.26.0 [\#10284](https://github.com/netdata/netdata/pull/10284) ([ilyam8](https://github.com/ilyam8)) -- use new libmosquitto release \(with MacOS libMosq fix\) [\#10283](https://github.com/netdata/netdata/pull/10283) ([underhood](https://github.com/underhood)) -- Address coverity errors \(CID 364045,364046\) [\#10282](https://github.com/netdata/netdata/pull/10282) ([stelfrag](https://github.com/stelfrag)) -- health/web\_log: remove `crit` from unmatched alarms [\#10280](https://github.com/netdata/netdata/pull/10280) ([ilyam8](https://github.com/ilyam8)) -- Fix compilation with https disabled. Fixes \#10278 [\#10279](https://github.com/netdata/netdata/pull/10279) ([KickerTom](https://github.com/KickerTom)) -- Fix race condition in rrdset\_first\_entry\_t\(\) and rrdset\_last\_entry\_t\(\) [\#10276](https://github.com/netdata/netdata/pull/10276) ([mfundul](https://github.com/mfundul)) -- Fix host name when syslog is used [\#10275](https://github.com/netdata/netdata/pull/10275) ([thiagoftsm](https://github.com/thiagoftsm)) -- Add guide: How to optimize Netdata's performance [\#10271](https://github.com/netdata/netdata/pull/10271) ([joelhans](https://github.com/joelhans)) -- Document the Agent reinstallation process [\#10270](https://github.com/netdata/netdata/pull/10270) ([joelhans](https://github.com/joelhans)) -- fix bug\_report.md syntax error [\#10269](https://github.com/netdata/netdata/pull/10269) ([OdysLam](https://github.com/OdysLam)) -- python.d/nvidia\_smi: use `pwd` lib to get username if not inside a container [\#10268](https://github.com/netdata/netdata/pull/10268) ([ilyam8](https://github.com/ilyam8)) -- Add kernel to blacklist [\#10262](https://github.com/netdata/netdata/pull/10262) ([thiagoftsm](https://github.com/thiagoftsm)) -- Made the update script significantly more robust and user friendly. [\#10261](https://github.com/netdata/netdata/pull/10261) ([Ferroin](https://github.com/Ferroin)) -- new issue templates [\#10259](https://github.com/netdata/netdata/pull/10259) ([OdysLam](https://github.com/OdysLam)) ## [v1.26.0](https://github.com/netdata/netdata/tree/v1.26.0) (2020-10-14) diff --git a/Makefile.am b/Makefile.am index 180d337ce..8355161bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,37 +55,38 @@ dist_noinst_DATA = \ cppcheck.sh \ configs.signatures \ contrib \ + docs \ + mqtt_websockets \ netdata.cppcheck \ netdata.spec \ package.json \ - docs \ - packaging/version \ - packaging/dashboard.version \ - packaging/dashboard.checksums \ - packaging/go.d.version \ - packaging/go.d.checksums \ - packaging/jsonc.version \ - packaging/jsonc.checksums \ - packaging/judy.version \ - packaging/judy.checksums \ - packaging/libwebsockets.version \ - packaging/libwebsockets.checksums \ - packaging/mosquitto.version \ - packaging/mosquitto.checksums \ packaging/bundle-dashboard.sh \ packaging/bundle-ebpf.sh \ packaging/bundle-judy.sh \ packaging/bundle-libbpf.sh \ + packaging/bundle-lws.sh \ packaging/bundle-mosquitto.sh \ packaging/check-kernel-config.sh \ - packaging/libbpf.checksums \ - packaging/libbpf.version \ + packaging/dashboard.checksums \ + packaging/dashboard.version \ packaging/ebpf.checksums \ packaging/ebpf.version \ - packaging/bundle-lws.sh \ + packaging/go.d.checksums \ + packaging/go.d.version \ packaging/installer/README.md \ packaging/installer/UNINSTALL.md \ packaging/installer/UPDATE.md \ + packaging/jsonc.checksums \ + packaging/jsonc.version \ + packaging/judy.checksums \ + packaging/judy.version \ + packaging/libbpf.checksums \ + packaging/libbpf.version \ + packaging/libwebsockets.checksums \ + packaging/libwebsockets.version \ + packaging/mosquitto.checksums \ + packaging/mosquitto.version \ + packaging/version \ $(NULL) # until integrated within build @@ -34,11 +34,11 @@ People get addicted to Netdata. Once you use it on your systems, there's no goin  -> **[Latest release](https://github.com/netdata/netdata/releases/latest): v1.29.0, February 2, 2021** +> **[Latest release](https://github.com/netdata/netdata/releases/latest): v1.30.0, March 31, 2021** > -> The v1.29.0 release of the Netdata Agent is a maintenance release that brings incremental but necessary improvements -> that make your monitoring experience more robust. We've pushed improvements and bug fixes to the installation and -> update scripts, enriched our library of collectors, and focused on fixing bugs reported by the community. +> The v1.30.0 release of Netdata brings major improvements to our packaging and completely replaces Google Analytics/GTM +> for product telemetry. We're also releasing the first changes in an upcoming overhaul to both our dashboard UI/UX and +> the suite of preconfigured alarms that comes with every installation. ## Menu @@ -54,7 +54,7 @@ Netdata](https://user-images.githubusercontent.com/1153921/96495792-2e881380-11f ## Features  +action](https://user-images.githubusercontent.com/1153921/113440964-449c2180-93a2-11eb-9664-663afa1257a8.gif) Here's what you can expect from Netdata: diff --git a/aclk/README.md b/aclk/README.md index e279f0182..ffd036b97 100644 --- a/aclk/README.md +++ b/aclk/README.md @@ -40,7 +40,7 @@ The information we store in Netdata Cloud is the following (using the publicly a How we use them: - The data are stored in our production database on Google Cloud and some of it is also used in BigQuery, our data lake, for analytics purposes. These analytics are crucial for our product development process. - Email is used to identify users in regards to product use and to enrich our tools with product use, such as our CRM. -- This data is only be available to Netdata and never to a 3rd party. +- This data is only available to Netdata and never to a 3rd party. ## Enable and configure the ACLK diff --git a/backends/nc-backend.sh b/backends/nc-backend.sh index 7280f86a0..65704b98f 100755 --- a/backends/nc-backend.sh +++ b/backends/nc-backend.sh @@ -49,7 +49,7 @@ listen_save_replay_forever() { if [ ${ret} -eq 0 ] then - log "Successfuly sent the metrics to ${real_backend_host}:${real_backend_port}" + log "Successfully sent the metrics to ${real_backend_host}:${real_backend_port}" mv "${file}" "${file}.old" touch "${file}" else diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in index e0fd85a1e..137d112fc 100755 --- a/claim/netdata-claim.sh.in +++ b/claim/netdata-claim.sh.in @@ -71,7 +71,7 @@ ERROR_MESSAGES[14]="processing claiming" ERROR_KEYS[15]="ErrInternalServerError" ERROR_MESSAGES[15]="Internal Server Error" -# Error: There was a timout processing the claim. +# Error: There was a timeout processing the claim. # HTTP Status code: 504 # Exit code: 16 ERROR_KEYS[16]="ErrGatewayTimeout" diff --git a/collectors/charts.d.plugin/libreswan/libreswan.chart.sh b/collectors/charts.d.plugin/libreswan/libreswan.chart.sh index bfa2b9ea1..a3a56b26d 100644 --- a/collectors/charts.d.plugin/libreswan/libreswan.chart.sh +++ b/collectors/charts.d.plugin/libreswan/libreswan.chart.sh @@ -170,7 +170,7 @@ END VALUESEOF } -# _update is called continiously, to collect the values +# _update is called continuously, to collect the values libreswan_update() { # the first argument to this function is the microseconds since last update # pass this parameter to the BEGIN statement (see bellow). diff --git a/collectors/charts.d.plugin/loopsleepms.sh.inc b/collectors/charts.d.plugin/loopsleepms.sh.inc index c386083fb..5608b8d8f 100644 --- a/collectors/charts.d.plugin/loopsleepms.sh.inc +++ b/collectors/charts.d.plugin/loopsleepms.sh.inc @@ -10,7 +10,7 @@ fi # ----------------------------------------------------------------------------- # use the date command as a high resolution timer -# macOS 'date' doesnt support '%N' precision +# macOS 'date' doesn't support '%N' precision # echo $(/bin/date +"%N") is "N" if [ "$($LOOPSLEEP_DATE +"%N")" = "N" ]; then LOOPSLEEP_DATE_FORMAT="%s * 1000" diff --git a/collectors/charts.d.plugin/opensips/opensips.chart.sh b/collectors/charts.d.plugin/opensips/opensips.chart.sh index 8ff3e32ef..447dd0bc0 100644 --- a/collectors/charts.d.plugin/opensips/opensips.chart.sh +++ b/collectors/charts.d.plugin/opensips/opensips.chart.sh @@ -158,7 +158,7 @@ opensips_update() { # local opensips_server_all_ then one or more of these a-z 0-9 _ then = and one of more of 0-9 # 4. then execute this as a script with the eval # be very carefull with eval: - # prepare the script and always grep at the end the lines that are usefull, so that + # prepare the script and always grep at the end the lines that are useful, so that # even if something goes wrong, no other code can be executed unset \ diff --git a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh index 22ff691f9..4c4ee9394 100755 --- a/contrib/debian/install_go.sh +++ b/contrib/debian/install_go.sh @@ -7,7 +7,7 @@ LIBEXEC_DIR="$3" # ############################################################ # Package Go within netdata (TBD: Package it separately) safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum >/dev/null 2>&1; then sha256sum $@ diff --git a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh index 9ce3863b9..e48c3c17c 100755 --- a/contrib/rhel/build-netdata-rpm.sh +++ b/contrib/rhel/build-netdata-rpm.sh @@ -25,7 +25,7 @@ if [[ "${version//-/}" != "$version" ]]; then # Append the current datetime fox a 'unique' build versionfix+="_$(date '+%m%d%H%M%S')" # And issue hints & details on why this failed, and how to fix it - run_failed "Current version contains '-' which is fobidden by rpm. You must create a git annotated tag and rerun this script. Exemple:" + run_failed "Current version contains '-' which is forbidden by rpm. You must create a git annotated tag and rerun this script. Example:" run_failed " git tag -a $versionfix -m 'Release by $(id -nu) on $(uname -n)' && $0" exit 1 fi diff --git a/daemon/main.c b/daemon/main.c index 346486a84..93ec78b6a 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -29,6 +29,10 @@ void netdata_cleanup_and_exit(int ret) { send_statistics("EXIT", ret?"ERROR":"OK","-"); + char agent_crash_file[FILENAME_MAX + 1]; + snprintfz(agent_crash_file, FILENAME_MAX, "%s/.agent_crash", netdata_configured_varlib_dir); + (void) unlink(agent_crash_file); + // cleanup/save the database and exit info("EXIT: cleaning up the database..."); rrdhost_cleanup_all(); @@ -1456,6 +1460,14 @@ int main(int argc, char **argv) { if(rrd_init(netdata_configured_hostname, system_info)) fatal("Cannot initialize localhost instance with name '%s'.", netdata_configured_hostname); + char agent_crash_file[FILENAME_MAX + 1]; + snprintfz(agent_crash_file, FILENAME_MAX, "%s/.agent_crash", netdata_configured_varlib_dir); + int crash_detected = (unlink(agent_crash_file) == 0); + int fd = open(agent_crash_file, O_WRONLY | O_CREAT | O_TRUNC, 444); + if (fd >= 0) + close(fd); + + // ------------------------------------------------------------------------ // Claim netdata agent to a cloud endpoint @@ -1498,6 +1510,8 @@ int main(int argc, char **argv) { netdata_ready = 1; send_statistics("START", "-", "-"); + if (crash_detected) + send_statistics("CRASH", "-", "-"); // ------------------------------------------------------------------------ // Report ACLK build failure diff --git a/docs/overview/what-is-netdata.md b/docs/overview/what-is-netdata.md index 8ee0db410..5c4b54952 100644 --- a/docs/overview/what-is-netdata.md +++ b/docs/overview/what-is-netdata.md @@ -57,9 +57,9 @@ case: - **Monitor**: Netdata's health watchdog uses hundreds of preconfigured alarms to notify you via Slack, email, PagerDuty and more when an anomaly strikes. Customize with dynamic thresholds, hysteresis, alarm templates, and role-based notifications. -- **Troubleshoot**: 1s granularity helps you detect analyze anomalies other monitoring platforms might have missed. - Interactive visualizations reduce your reliance on the console, and historical metrics help you trace issues back to - their root cause. +- **Troubleshoot**: 1s granularity helps you detect and analyze anomalies other monitoring platforms might have + missed. Interactive visualizations reduce your reliance on the console, and historical metrics help you trace issues + back to their root cause. - **Store**: Netdata's efficient database engine efficiently stores per-second metrics for days, weeks, or even months. Every distributed node stores metrics locally, simplifying deployment, slashing costs, and enriching Netdata's interactive dashboards. diff --git a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh index 9c8b08e60..168c0d4b7 100755 --- a/exporting/nc-exporting.sh +++ b/exporting/nc-exporting.sh @@ -49,7 +49,7 @@ listen_save_replay_forever() { if [ ${ret} -eq 0 ] then - log "Successfuly sent the metrics to ${real_backend_host}:${real_backend_port}" + log "Successfully sent the metrics to ${real_backend_host}:${real_backend_port}" mv "${file}" "${file}.old" touch "${file}" else diff --git a/health/health_json.c b/health/health_json.c index 2a81d1c02..74a384a3b 100644 --- a/health/health_json.c +++ b/health/health_json.c @@ -349,6 +349,18 @@ void health_alarms_values2json(RRDHOST *host, BUFFER *wb, int all) { rrdhost_unlock(host); } +static int have_recent_alarm(RRDHOST *host, uint32_t alarm_id, time_t mark) +{ + ALARM_ENTRY *ae = host->health_log.alarms; + + while(ae) { + if (ae->alarm_id == alarm_id && ae->unique_id > mark && + (ae->new_status != RRDCALC_STATUS_WARNING && ae->new_status != RRDCALC_STATUS_CRITICAL)) + return 1; + ae = ae->next; + } + return 0; +} void health_active_log_alarms_2json(RRDHOST *host, BUFFER *wb) { netdata_rwlock_rdlock(&host->health_log.alarm_log_rwlock); @@ -363,6 +375,10 @@ void health_active_log_alarms_2json(RRDHOST *host, BUFFER *wb) { ((ae->new_status == RRDCALC_STATUS_WARNING || ae->new_status == RRDCALC_STATUS_CRITICAL) || ((ae->old_status == RRDCALC_STATUS_WARNING || ae->old_status == RRDCALC_STATUS_CRITICAL) && ae->new_status == RRDCALC_STATUS_REMOVED))) { + + if (have_recent_alarm(host, ae->alarm_id, ae->unique_id)) + continue; + if (likely(count)) buffer_strcat(wb, ","); health_alarm_entry2json_nolock(wb, ae, host); diff --git a/health/notifications/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf index 2dab1d489..ae23180bb 100755 --- a/health/notifications/health_alarm_notify.conf +++ b/health/notifications/health_alarm_notify.conf @@ -220,8 +220,8 @@ DEFAULT_RECIPIENT_EMAIL="root" # You can also have netdata add headers to the message that will # cause most e-mail clients to treat all notifications for a given # chart+alarm+host combination as a single thread. This can help -# simplify tracking of alarms, as it provides an easy wway for scripts -# to corelate messages and also will cause most clients to group all the +# simplify tracking of alarms, as it provides an easy way for scripts +# to correlate messages and also will cause most clients to group all the # messages together. This is enabled by default, uncomment the line # below if you want to disable it. #EMAIL_THREADING="NO" @@ -480,7 +480,7 @@ SEND_MSTEAM="YES" # This value will be replaced in the webhook value to publish to several channels in a same Team. # In order to get it working properly, you have to replace the value between [] ....IncomingWebhook/[___]/..... by "CHANNEL" string. DEFAULT_RECIPIENT_MSTEAM="" -# Based on the way MS Teams is working, put the differents channels here like : "CHANNEL1 CHANNEL2 ..." +# Based on the way MS Teams is working, put the different channels here like : "CHANNEL1 CHANNEL2 ..." # AT LEAST ONE CHANNEL IS MANDATORY MSTEAM_WEBHOOK_URL="" @@ -703,7 +703,7 @@ SEND_SYSLOG="NO" # A note on log levels and facilities: # # The traditional UNIX syslog mechanism has the concept of both log -# levels and facilities. A log level indicates the relaitve severity of +# levels and facilities. A log level indicates the relative severity of # the message, while a facility specifies a generic source for the message # (for example, the `mail` facility is where sendmail and postfix log # their messages). All major syslog daemons have the ability to filter @@ -762,7 +762,7 @@ DEFAULT_RECIPIENT_SYSLOG="netdata" SEND_PROWL="YES" # If a role's recipients are not configured, use the following, -# (empty = do not send a notiication for unconfigured roles) +# (empty = do not send a notification for unconfigured roles) # # Recipients for iOS push notifications are Prowl API keys. # @@ -949,7 +949,7 @@ role_recipients_irc[sysadmin]="${DEFAULT_RECIPIENT_IRC}" role_recipients_syslog[sysadmin]="${DEFAULT_RECIPIENT_SYSLOG}" -role_recipients_prowl[sysadming]="${DEFAULT_RECIPIENT_PROWL}" +role_recipients_prowl[sysadmin]="${DEFAULT_RECIPIENT_PROWL}" role_recipients_awssns[sysadmin]="${DEFAULT_RECIPIENT_AWSSNS}" @@ -1180,7 +1180,7 @@ role_recipients_syslog[proxyadmin]="${DEFAULT_RECIPIENT_SYSLOG}" role_recipients_prowl[proxyadmin]="${DEFAULT_RECIPIENT_PROWL}" -role_recipients_awssns[porxyadmin]="${DEFAULT_RECIPIENT_AWSSNS}" +role_recipients_awssns[proxyadmin]="${DEFAULT_RECIPIENT_AWSSNS}" role_recipients_custom[proxyadmin]="${DEFAULT_RECIPIENT_CUSTOM}" diff --git a/netdata-installer.sh b/netdata-installer.sh index c7867243a..2bc9abc51 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -68,7 +68,7 @@ if [ -z "${TMPDIR}" ] || _cannot_use_tmpdir "${TMPDIR}"; then if _cannot_use_tmpdir /tmp; then if _cannot_use_tmpdir "${PWD}"; then echo >&2 - echo >&2 "Unable to find a usable temprorary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -209,7 +209,7 @@ USAGE: ${PROGRAM} [options] are: systemd, interval, crontab --stable-channel Use packages from GitHub release pages instead of GCS (nightly updates). This results in less frequent updates. - --nightly-channel Use most recent nightly udpates instead of GitHub releases. + --nightly-channel Use most recent nightly updates instead of GitHub releases. This results in more frequent updates. --disable-go Disable installation of go.d.plugin. --disable-ebpf Disable eBPF Kernel plugin (Default: enabled) @@ -239,7 +239,7 @@ USAGE: ${PROGRAM} [options] --zlib-is-really-here or --libs-are-really-here If you get errors about missing zlib or libuuid but you know it is available, you might have a broken pkg-config. Use this option to proceed without checking pkg-config. - --disable-telemetry Use this flag to opt-out from our anonymous telemetry progam. (DO_NOT_TRACK=1) + --disable-telemetry Use this flag to opt-out from our anonymous telemetry program. (DO_NOT_TRACK=1) Netdata will by default be compiled with gcc optimization -O2 If you need to pass different CFLAGS, use something like this: @@ -250,7 +250,7 @@ If you also need to provide different LDFLAGS, use something like this: LDFLAGS="<extra ldflag options>" ${PROGRAM} [options] -or use the following if both LDFLAGS and CFLAGS need to be overriden: +or use the following if both LDFLAGS and CFLAGS need to be overridden: CFLAGS="<gcc options>" LDFLAGS="<extra ld options>" ${PROGRAM} [options] diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 41e887001..d91d1a773 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # author : paulfantom -# This image contains preinstalled dependecies +# This image contains preinstalled dependencies # hadolint ignore=DL3007 FROM netdata/builder:latest as builder @@ -52,7 +52,7 @@ RUN mkdir -p /app/usr/sbin/ \ chmod +x /app/usr/sbin/run.sh ##################################################################### -# This image contains preinstalled dependecies +# This image contains preinstalled dependencies # hadolint ignore=DL3007 FROM netdata/base:latest as base diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index 03ceb2a52..fd10fcfaf 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -760,7 +760,7 @@ create_netdata_conf() { run_ok "New configuration saved for you to edit at ${path}" else [ -f "${path}.new" ] && rm "${path}.new" - run_failed "Cannnot download configuration from netdata daemon using url '${url}'" + run_failed "Cannot download configuration from netdata daemon using url '${url}'" url='' fi fi @@ -891,7 +891,7 @@ portable_add_user_to_group() { } safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 23cbe12d5..203f7c6cb 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -141,7 +141,7 @@ EOF release2lsb_release() { # loads the given /etc/x-release file - # this file is normaly a single line containing something like + # this file is normally a single line containing something like # # X Linux release 1.2.3 (release-name) # @@ -322,8 +322,8 @@ user_picks_distribution() { echo >&2 "I found though that the following installers are available:" echo >&2 [ -n "${apt_get}" ] && echo >&2 " - Debian/Ubuntu based (installer is: apt-get)" && opts="apt-get ${opts}" - [ -n "${yum}" ] && echo >&2 " - Redhat/Fedora/Centos based (installer is: yum)" && opts="yum ${opts}" - [ -n "${dnf}" ] && echo >&2 " - Redhat/Fedora/Centos based (installer is: dnf)" && opts="dnf ${opts}" + [ -n "${yum}" ] && echo >&2 " - Red Hat/Fedora/CentOS based (installer is: yum)" && opts="yum ${opts}" + [ -n "${dnf}" ] && echo >&2 " - Red Hat/Fedora/CentOS based (installer is: dnf)" && opts="dnf ${opts}" [ -n "${zypper}" ] && echo >&2 " - SuSe based (installer is: zypper)" && opts="zypper ${opts}" [ -n "${pacman}" ] && echo >&2 " - Arch Linux based (installer is: pacman)" && opts="pacman ${opts}" [ -n "${emerge}" ] && echo >&2 " - Gentoo based (installer is: emerge)" && opts="emerge ${opts}" @@ -1265,7 +1265,7 @@ suitable_package() { return 0 elif [ -z "${p}" ]; then echo >&2 "WARNING" - echo >&2 "package ${1} is not availabe in this system." + echo >&2 "package ${1} is not available in this system." echo >&2 return 1 else @@ -1492,7 +1492,7 @@ install_apt_get() { prompt() { if [ "${NON_INTERACTIVE}" -eq 1 ]; then echo >&2 "Running in non-interactive mode, assuming yes (y)" - echo >&2 " > Would have promptedfor ${1} ..." + echo >&2 " > Would have prompted for ${1} ..." return 0 fi diff --git a/packaging/installer/kickstart-static64.sh b/packaging/installer/kickstart-static64.sh index a86a62fcd..36aca54d7 100755 --- a/packaging/installer/kickstart-static64.sh +++ b/packaging/installer/kickstart-static64.sh @@ -151,7 +151,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - echo >&2 "Unable to find a usable temprorary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -283,7 +283,7 @@ while [ -n "${1}" ]; do done if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then - NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:+${NETDATA_INSTALLER_OPTIONS} }--disable-telemtry" + NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:+${NETDATA_INSTALLER_OPTIONS} }--disable-telemetry" fi if [ -n "${NETDATA_DISABLE_CLOUD}" ]; then diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh index bd18b7db5..3c90cc816 100755 --- a/packaging/installer/kickstart.sh +++ b/packaging/installer/kickstart.sh @@ -183,7 +183,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - echo >&2 "Unable to find a usable temprorary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -293,7 +293,7 @@ dependencies() { } safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" diff --git a/packaging/installer/methods/kickstart-64.md b/packaging/installer/methods/kickstart-64.md index dbb0cd464..ea6cf32ea 100644 --- a/packaging/installer/methods/kickstart-64.md +++ b/packaging/installer/methods/kickstart-64.md @@ -77,7 +77,7 @@ To use `md5sum` to verify the integrity of the `kickstart-static64.sh` script yo command above, run the following: ```bash -[ "33ed36d80c7db0e501b68c4c0c3ceb02" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" +[ "c735fd724be5726c8a1850deed2793b8" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" ``` If the script is valid, this command will return `OK, VALID`. diff --git a/packaging/installer/methods/kickstart.md b/packaging/installer/methods/kickstart.md index 8ad99dc4a..0fc09ae83 100644 --- a/packaging/installer/methods/kickstart.md +++ b/packaging/installer/methods/kickstart.md @@ -60,7 +60,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do run the following: ```bash -[ "35e92cd3fd8a29621e23962ac5626dfc" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" +[ "a708de3790fa39188babe71eb1639c66" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" ``` If the script is valid, this command will return `OK, VALID`. diff --git a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh index f62934f72..a248860da 100755 --- a/packaging/installer/netdata-uninstaller.sh +++ b/packaging/installer/netdata-uninstaller.sh @@ -14,7 +14,7 @@ usage="$(basename "$0") [-h] [-f ] -- program to calculate the answer to life, the universe and everything where: - -e, --env path to environment file (defauls to '/etc/netdata/.environment' + -e, --env path to environment file (defaults to '/etc/netdata/.environment' -f, --force force uninstallation and do not ask any questions -h show this help text -y, --yes flag needs to be set to proceed with uninstallation" diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh index 2b833d79c..ad7412255 100755 --- a/packaging/installer/netdata-updater.sh +++ b/packaging/installer/netdata-updater.sh @@ -65,7 +65,7 @@ if [ "${ENVIRONMENT_FILE}" == "THIS_SHOULD_BE_REPLACED_BY_INSTALLER_SCRIPT" ]; t fi safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" @@ -123,7 +123,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - echo >&2 "Unable to find a usable temprorary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -215,7 +215,7 @@ parse_version() { r="${1}" if echo "${r}" | grep -q '^v.*'; then # shellcheck disable=SC2001 - # XXX: Need a regex group subsitutation here. + # XXX: Need a regex group substitution here. r="$(echo "${r}" | sed -e 's/^v\(.*\)/\1/')" fi @@ -234,13 +234,11 @@ parse_version() { } get_latest_version() { - local latest if [ "${RELEASE_CHANNEL}" == "stable" ]; then - latest="$(download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4)" + download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4 else - latest="$(download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout)" + download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout fi - parse_version "$latest" } set_tarball_urls() { @@ -272,7 +270,9 @@ update() { download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" >&3 2>&3 current_version="$(command -v netdata > /dev/null && parse_version "$(netdata -v | cut -f 2 -d ' ')")" - latest_version="$(get_latest_version)" + latest_tag="$(get_latest_version)" + latest_version="$(parse_version "${latest_tag}")" + path_version="$(echo "${latest_tag}" | cut -f 1 -d "-")" # If we can't get the current version for some reason assume `0` current_version="${current_version:-0}" @@ -295,9 +295,9 @@ update() { NEW_CHECKSUM="$(safe_sha256sum netdata-latest.tar.gz 2> /dev/null | cut -d' ' -f1)" tar -xf netdata-latest.tar.gz >&3 2>&3 rm netdata-latest.tar.gz >&3 2>&3 - cd netdata-* || exit 1 + cd "$(find . -maxdepth 1 -name "netdata-${path_version}*" | head -n 1)" || exit 1 RUN_INSTALLER=1 - cd "${NETDATA_LOCAL_TARBAL_OVERRIDE}" || exit 1 + cd "${NETDATA_LOCAL_TARBALL_OVERRIDE}" || exit 1 fi # We got the sources, run the update now @@ -362,7 +362,7 @@ while [ -n "${1}" ]; do fi done -# Random sleep to aileviate stampede effect of Agents upgrading +# Random sleep to alleviate stampede effect of Agents upgrading # and disconnecting/reconnecting at the same time (or near to). # But only we're not a controlling terminal (tty) # Randomly sleep between 1s and 60m @@ -376,7 +376,7 @@ source "${ENVIRONMENT_FILE}" || exit 1 # We dont expect to find lib dir variable on older installations, so load this path if none found export NETDATA_LIB_DIR="${NETDATA_LIB_DIR:-${NETDATA_PREFIX}/var/lib/netdata}" -# Source the tarbal checksum, if not already available from environment (for existing installations with the old logic) +# Source the tarball checksum, if not already available from environment (for existing installations with the old logic) [[ -z "${NETDATA_TARBALL_CHECKSUM}" ]] && [[ -f ${NETDATA_LIB_DIR}/netdata.tarball.checksum ]] && NETDATA_TARBALL_CHECKSUM="$(cat "${NETDATA_LIB_DIR}/netdata.tarball.checksum")" # Grab the nightlies baseurl (defaulting to our Google Storage bucket) @@ -412,7 +412,7 @@ if [ "${IS_NETDATA_STATIC_BINARY}" == "yes" ]; then download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" download "${NETDATA_TARBALL_URL}" "${ndtmpdir}/netdata-latest.gz.run" if ! grep netdata-latest.gz.run "${ndtmpdir}/sha256sum.txt" | safe_sha256sum -c - > /dev/null 2>&1; then - fatal "Static binary checksum validation failed. Stopping netdata installation and leaving binary in ${ndtmpdir}\nUsually this is a result of an older copy of the file being cached somehere and can be resolved by simply retrying in an hour." + fatal "Static binary checksum validation failed. Stopping netdata installation and leaving binary in ${ndtmpdir}\nUsually this is a result of an older copy of the file being cached somewhere and can be resolved by simply retrying in an hour." fi # Do not pass any options other than the accept, for now diff --git a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh index b4e516be2..a3e8cf605 100755 --- a/packaging/makeself/install-alpine-packages.sh +++ b/packaging/makeself/install-alpine-packages.sh @@ -39,7 +39,7 @@ apk add --no-cache -U \ gzip \ xz || exit 1 -# snappy doesnt have static version in alpine, let's compile it +# snappy doesn't have static version in alpine, let's compile it export SNAPPY_VER="1.1.7" wget -O /snappy.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VER}.tar.gz tar -C / -xf /snappy.tar.gz diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index bbf631bcb..11fcc091c 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -58,7 +58,7 @@ while [ "${1}" ]; do done if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemtry" + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemetry" fi deleted_stock_configs=0 diff --git a/packaging/makeself/makeself-help-header.txt b/packaging/makeself/makeself-help-header.txt index 9a8a3ec33..b2b1e4a76 100644 --- a/packaging/makeself/makeself-help-header.txt +++ b/packaging/makeself/makeself-help-header.txt @@ -28,7 +28,7 @@ - /lib/systemd/system/netdata.service - or, for older Centos, Debian/Ubuntu or OpenRC Gentoo: + or, for older CentOS, Debian/Ubuntu or OpenRC Gentoo: - /etc/init.d/netdata will be created diff --git a/packaging/makeself/makeself-license.txt b/packaging/makeself/makeself-license.txt index bf482c465..518d85d95 100644 --- a/packaging/makeself/makeself-license.txt +++ b/packaging/makeself/makeself-license.txt @@ -28,7 +28,7 @@ - /lib/systemd/system/netdata.service - or, for older Centos, Debian/Ubuntu or OpenRC Gentoo: + or, for older CentOS, Debian/Ubuntu or OpenRC Gentoo: - /etc/init.d/netdata will be created diff --git a/packaging/makeself/makeself.sh b/packaging/makeself/makeself.sh index f3cb69976..15a002884 100755 --- a/packaging/makeself/makeself.sh +++ b/packaging/makeself/makeself.sh @@ -40,7 +40,7 @@ # - 2.0.1 : Added --copy # - 2.1.0 : Allow multiple tarballs to be stored in one archive, and incremental updates. # Added --nochown for archives -# Stopped doing redundant checksums when not necesary +# Stopped doing redundant checksums when not necessary # - 2.1.1 : Work around insane behavior from certain Linux distros with no 'uncompress' command # Cleaned up the code to handle error codes from compress. Simplified the extraction code. # - 2.1.2 : Some bug fixes. Use head -n to avoid problems. @@ -63,7 +63,7 @@ # Check for available disk space before extracting to the target directory (Andreas Schweitzer) # Allow extraction to run asynchronously (patch by Peter Hatch) # Use file descriptors internally to avoid error messages (patch by Kay Tiong Khoo) -# - 2.1.6 : Replaced one dot per file progress with a realtime progress percentage and a spining cursor (Guy Baconniere) +# - 2.1.6 : Replaced one dot per file progress with a realtime progress percentage and a spinning cursor (Guy Baconniere) # Added --noprogress to prevent showing the progress during the decompression (Guy Baconniere) # Added --target dir to allow extracting directly to a target directory (Guy Baconniere) # - 2.2.0 : Many bugfixes, updates and contributions from users. Check out the project page on Github for the details. diff --git a/packaging/makeself/openssl.version b/packaging/makeself/openssl.version index adc000b35..aa2c66c02 100644 --- a/packaging/makeself/openssl.version +++ b/packaging/makeself/openssl.version @@ -1 +1 @@ -OpenSSL_1_1_1h +OpenSSL_1_1_1k diff --git a/packaging/scripts/install.sh b/packaging/scripts/install.sh index c591b0bee..b14ca11e5 100755 --- a/packaging/scripts/install.sh +++ b/packaging/scripts/install.sh @@ -77,7 +77,7 @@ case "${DISTRO}" in install_suse_like ;; *) - printf "ERROR: unspported distro: %s_%s\n" "${DISTRO}" "${DISTRO_VERSION}" + printf "ERROR: unsupported distro: %s_%s\n" "${DISTRO}" "${DISTRO_VERSION}" exit 1 ;; esac diff --git a/packaging/version b/packaging/version index c8c2eaea5..46aa51be0 100644 --- a/packaging/version +++ b/packaging/version @@ -1 +1 @@ -v1.30.0 +v1.30.1 diff --git a/tests/alarm_repetition/alarm.sh.in b/tests/alarm_repetition/alarm.sh.in index 09d6aaf46..3ceab6607 100644 --- a/tests/alarm_repetition/alarm.sh.in +++ b/tests/alarm_repetition/alarm.sh.in @@ -84,6 +84,6 @@ cp -a netdata.conf_with_repetition netdata.conf process_data "ram_with" "I" "activated." rm netdata.conf -echo -e "${GREEN} all the tests were sucessful ${NOCOLOR}" +echo -e "${GREEN} all the tests were successful ${NOCOLOR}" rm "$HEALTHDIR/ram.conf" rm -rf $OUTDIR diff --git a/tests/installer/checksums.sh b/tests/installer/checksums.sh index 3fbbfa386..e83e0c23c 100755 --- a/tests/installer/checksums.sh +++ b/tests/installer/checksums.sh @@ -51,4 +51,4 @@ check_file() { check_file kickstart.sh packaging/installer/methods/kickstart.md check_file kickstart-static64.sh packaging/installer/methods/kickstart-64.md -echo "No problems found, exiting succesfully!" +echo "No problems found, exiting successfully!" diff --git a/tests/template_dimension/template_dim.sh.in b/tests/template_dimension/template_dim.sh.in index 88978fd84..007892585 100644 --- a/tests/template_dimension/template_dim.sh.in +++ b/tests/template_dimension/template_dim.sh.in @@ -85,4 +85,4 @@ process_data "foreach_with_template" 10 "$HEALTHDIR/dim_foreach_with_template_sp rm "$HEALTHDIR/dim_foreach_with_template_sp.conf" rm -rf "$OUTDIR" -echo -e "${GREEN} all the tests were sucessful ${NOCOLOR}" +echo -e "${GREEN} all the tests were successful ${NOCOLOR}" diff --git a/tests/updater_checks.bats b/tests/updater_checks.bats index 930cea990..d9f4cc0ca 100755 --- a/tests/updater_checks.bats +++ b/tests/updater_checks.bats @@ -54,7 +54,7 @@ setup() { @test "update netdata using the new updater" { export ENVIRONMENT_FILE="${ENV}" # Run the updater, with the override so that it uses the local repo we have at hand - export NETDATA_LOCAL_TARBAL_OVERRIDE="${PWD}" + export NETDATA_LOCAL_TARBALL_OVERRIDE="${PWD}" ${INSTALLATION}/netdata/usr/libexec/netdata/netdata-updater.sh --not-running-from-cron ! grep "new_installation" "${ENV}" } diff --git a/tests/updater_checks.sh b/tests/updater_checks.sh index dff87a670..1c8d7b028 100755 --- a/tests/updater_checks.sh +++ b/tests/updater_checks.sh @@ -63,7 +63,7 @@ case "${running_os}" in ;; esac -# Run depednency scriptlet, before anything else +# Run dependency scriptlet, before anything else # ./packaging/installer/install-required-packages.sh --non-interactive netdata diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c index 5b12c89ba..4344af4ac 100644 --- a/web/api/formatters/rrd2json.c +++ b/web/api/formatters/rrd2json.c @@ -95,12 +95,8 @@ void build_context_param_list(struct context_param **param_list, RRDSET *st) memcpy(rd->state, rd1->state, sizeof(*rd->state)); memcpy(&rd->state->collect_ops, &rd1->state->collect_ops, sizeof(struct rrddim_collect_ops)); memcpy(&rd->state->query_ops, &rd1->state->query_ops, sizeof(struct rrddim_query_ops)); -#ifdef ENABLE_DBENGINE - if (rd->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE) { - rd->state->metric_uuid = mallocz(sizeof(uuid_t)); - uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); - } -#endif + rd->state->metric_uuid = mallocz(sizeof(uuid_t)); + uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); rd->next = (*param_list)->rd; (*param_list)->rd = rd; } |