Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ktsaou committed Jun 20, 2023
2 parents ae80661 + ec7830c commit ddd6967
Show file tree
Hide file tree
Showing 17 changed files with 58 additions and 40 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

**Merged pull requests:**

- RW\_SPINLOCK: recursive readers support [\#15217](https://github.com/netdata/netdata/pull/15217) ([ktsaou](https://github.com/ktsaou))
- Fix health crash [\#15209](https://github.com/netdata/netdata/pull/15209) ([stelfrag](https://github.com/stelfrag))
- Fix file permissions under directory [\#15208](https://github.com/netdata/netdata/pull/15208) ([stelfrag](https://github.com/stelfrag))
- RocketChat cloud integration docs [\#15205](https://github.com/netdata/netdata/pull/15205) ([car12o](https://github.com/car12o))
Expand Down Expand Up @@ -406,8 +407,6 @@
- pandas collector add `read_sql()` support [\#14563](https://github.com/netdata/netdata/pull/14563) ([andrewm4894](https://github.com/andrewm4894))
- reviewed plans page to be according to latest updates [\#14560](https://github.com/netdata/netdata/pull/14560) ([hugovalente-pm](https://github.com/hugovalente-pm))
- Fix kickstart link [\#14559](https://github.com/netdata/netdata/pull/14559) ([cakrit](https://github.com/cakrit))
- Make secure nodes a category landing page [\#14558](https://github.com/netdata/netdata/pull/14558) ([cakrit](https://github.com/cakrit))
- Add misc landing page and move proxy guides [\#14557](https://github.com/netdata/netdata/pull/14557) ([cakrit](https://github.com/cakrit))

## [v1.38.1](https://github.com/netdata/netdata/tree/v1.38.1) (2023-02-13)

Expand Down
2 changes: 1 addition & 1 deletion packaging/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.40.0-16-nightly
v1.40.0-18-nightly
14 changes: 7 additions & 7 deletions web/gui/dashboard/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dist_web_DATA = \
$(srcdir)/index.html \
$(srcdir)/infographic.html \
$(srcdir)/manifest.json \
$(srcdir)/precache-manifest.21dcd7c609bff6504512face054c360f.js \
$(srcdir)/precache-manifest.e5b6a1ab9fdefc1884e759852e26f326.js \
$(srcdir)/refresh-badges.js \
$(srcdir)/robots.txt \
$(srcdir)/service-worker.js \
Expand Down Expand Up @@ -147,9 +147,9 @@ webstaticjsdir=$(webdir)/static/js
dist_webstaticjs_DATA = \
$(srcdir)/static/js/10.a5cd7d0e.chunk.js \
$(srcdir)/static/js/10.a5cd7d0e.chunk.js.map \
$(srcdir)/static/js/2.ae48988e.chunk.js \
$(srcdir)/static/js/2.ae48988e.chunk.js.LICENSE \
$(srcdir)/static/js/2.ae48988e.chunk.js.map \
$(srcdir)/static/js/2.fbe8638b.chunk.js \
$(srcdir)/static/js/2.fbe8638b.chunk.js.LICENSE \
$(srcdir)/static/js/2.fbe8638b.chunk.js.map \
$(srcdir)/static/js/3.f137faca.chunk.js \
$(srcdir)/static/js/3.f137faca.chunk.js.map \
$(srcdir)/static/js/4.2dbcd906.chunk.js \
Expand All @@ -165,9 +165,9 @@ dist_webstaticjs_DATA = \
$(srcdir)/static/js/8.b4161ea2.chunk.js.map \
$(srcdir)/static/js/9.a4363968.chunk.js \
$(srcdir)/static/js/9.a4363968.chunk.js.map \
$(srcdir)/static/js/main.76dfe4de.chunk.js \
$(srcdir)/static/js/main.76dfe4de.chunk.js.LICENSE \
$(srcdir)/static/js/main.76dfe4de.chunk.js.map \
$(srcdir)/static/js/main.15e0c54f.chunk.js \
$(srcdir)/static/js/main.15e0c54f.chunk.js.LICENSE \
$(srcdir)/static/js/main.15e0c54f.chunk.js.map \
$(srcdir)/static/js/runtime-main.08abed8f.js \
$(srcdir)/static/js/runtime-main.08abed8f.js.map \
$(NULL)
Expand Down
18 changes: 9 additions & 9 deletions web/gui/dashboard/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"files": {
"main.css": "./static/css/main.53ba10f1.chunk.css",
"main.js": "./static/js/main.76dfe4de.chunk.js",
"main.js.map": "./static/js/main.76dfe4de.chunk.js.map",
"main.js": "./static/js/main.15e0c54f.chunk.js",
"main.js.map": "./static/js/main.15e0c54f.chunk.js.map",
"runtime-main.js": "./static/js/runtime-main.08abed8f.js",
"runtime-main.js.map": "./static/js/runtime-main.08abed8f.js.map",
"static/css/2.c454aab8.chunk.css": "./static/css/2.c454aab8.chunk.css",
"static/js/2.ae48988e.chunk.js": "./static/js/2.ae48988e.chunk.js",
"static/js/2.ae48988e.chunk.js.map": "./static/js/2.ae48988e.chunk.js.map",
"static/js/2.fbe8638b.chunk.js": "./static/js/2.fbe8638b.chunk.js",
"static/js/2.fbe8638b.chunk.js.map": "./static/js/2.fbe8638b.chunk.js.map",
"static/js/3.f137faca.chunk.js": "./static/js/3.f137faca.chunk.js",
"static/js/3.f137faca.chunk.js.map": "./static/js/3.f137faca.chunk.js.map",
"static/css/4.a36e3b73.chunk.css": "./static/css/4.a36e3b73.chunk.css",
Expand All @@ -26,22 +26,22 @@
"static/js/10.a5cd7d0e.chunk.js": "./static/js/10.a5cd7d0e.chunk.js",
"static/js/10.a5cd7d0e.chunk.js.map": "./static/js/10.a5cd7d0e.chunk.js.map",
"index.html": "./index.html",
"precache-manifest.21dcd7c609bff6504512face054c360f.js": "./precache-manifest.21dcd7c609bff6504512face054c360f.js",
"precache-manifest.e5b6a1ab9fdefc1884e759852e26f326.js": "./precache-manifest.e5b6a1ab9fdefc1884e759852e26f326.js",
"service-worker.js": "./service-worker.js",
"static/css/2.c454aab8.chunk.css.map": "./static/css/2.c454aab8.chunk.css.map",
"static/css/4.a36e3b73.chunk.css.map": "./static/css/4.a36e3b73.chunk.css.map",
"static/css/main.53ba10f1.chunk.css.map": "./static/css/main.53ba10f1.chunk.css.map",
"static/js/2.ae48988e.chunk.js.LICENSE": "./static/js/2.ae48988e.chunk.js.LICENSE",
"static/js/2.fbe8638b.chunk.js.LICENSE": "./static/js/2.fbe8638b.chunk.js.LICENSE",
"static/js/5.2f783a54.chunk.js.LICENSE": "./static/js/5.2f783a54.chunk.js.LICENSE",
"static/js/main.76dfe4de.chunk.js.LICENSE": "./static/js/main.76dfe4de.chunk.js.LICENSE",
"static/js/main.15e0c54f.chunk.js.LICENSE": "./static/js/main.15e0c54f.chunk.js.LICENSE",
"static/media/index.css": "./static/media/ibm-plex-sans-latin-700italic.72e9af40.woff",
"static/media/fonts.css": "./static/media/material-icons.0509ab09.woff2"
},
"entrypoints": [
"static/js/runtime-main.08abed8f.js",
"static/css/2.c454aab8.chunk.css",
"static/js/2.ae48988e.chunk.js",
"static/js/2.fbe8638b.chunk.js",
"static/css/main.53ba10f1.chunk.css",
"static/js/main.76dfe4de.chunk.js"
"static/js/main.15e0c54f.chunk.js"
]
}
4 changes: 2 additions & 2 deletions web/gui/dashboard/dashboard-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ const fixHost = (host) => {
host = host.substring(0, host.length - 1);
}

return host;
return host.replace(/\/v1\/?$/, "");
}

NETDATA.chartRegistry = {
Expand Down Expand Up @@ -555,7 +555,7 @@ NETDATA.fixHost = function (host) {
host = host.substring(0, host.length - 1);
}

return host;
return host.replace(/\/v1\/?$/, "");
};


Expand Down
21 changes: 20 additions & 1 deletion web/gui/dashboard/index.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "e3c4d364a9ff58ad73696ca1489b2f53",
"revision": "8a1fcd4553d6f7278b22f7023d971a1d",
"url": "./index.html"
},
{
"revision": "74af867d0b165be1d3e9",
"revision": "8535644559c8c34c2b2d",
"url": "./static/css/2.c454aab8.chunk.css"
},
{
"revision": "3f3e6e773062ffa97127",
"url": "./static/css/4.a36e3b73.chunk.css"
},
{
"revision": "16fe102ed87c5308ae90",
"revision": "697bfc63a3d8c065a840",
"url": "./static/css/main.53ba10f1.chunk.css"
},
{
"revision": "2e1518ba242fafff36c2",
"url": "./static/js/10.a5cd7d0e.chunk.js"
},
{
"revision": "74af867d0b165be1d3e9",
"url": "./static/js/2.ae48988e.chunk.js"
"revision": "8535644559c8c34c2b2d",
"url": "./static/js/2.fbe8638b.chunk.js"
},
{
"revision": "202231b589b831e707a2050ef8b04086",
"url": "./static/js/2.ae48988e.chunk.js.LICENSE"
"url": "./static/js/2.fbe8638b.chunk.js.LICENSE"
},
{
"revision": "9d949a4191279169d355",
Expand Down Expand Up @@ -60,12 +60,12 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "./static/js/9.a4363968.chunk.js"
},
{
"revision": "16fe102ed87c5308ae90",
"url": "./static/js/main.76dfe4de.chunk.js"
"revision": "697bfc63a3d8c065a840",
"url": "./static/js/main.15e0c54f.chunk.js"
},
{
"revision": "19356475904bddb45614eb6ff7f6cd44",
"url": "./static/js/main.76dfe4de.chunk.js.LICENSE"
"url": "./static/js/main.15e0c54f.chunk.js.LICENSE"
},
{
"revision": "a99878aeea4445b20339",
Expand Down
2 changes: 1 addition & 1 deletion web/gui/dashboard/service-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");

importScripts(
"./precache-manifest.21dcd7c609bff6504512face054c360f.js"
"./precache-manifest.e5b6a1ab9fdefc1884e759852e26f326.js"
);

self.addEventListener('message', (event) => {
Expand Down
3 changes: 0 additions & 3 deletions web/gui/dashboard/static/js/2.ae48988e.chunk.js

This file was deleted.

3 changes: 3 additions & 0 deletions web/gui/dashboard/static/js/2.fbe8638b.chunk.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions web/gui/dashboard/static/js/main.15e0c54f.chunk.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions web/gui/dashboard/static/js/main.15e0c54f.chunk.js.map

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions web/gui/dashboard/static/js/main.76dfe4de.chunk.js

This file was deleted.

1 change: 0 additions & 1 deletion web/gui/dashboard/static/js/main.76dfe4de.chunk.js.map

This file was deleted.

0 comments on commit ddd6967

Please sign in to comment.