From 8b48e36933a89c7abf44e4baa41317d509e1506b Mon Sep 17 00:00:00 2001 From: Levi Harrison Date: Sun, 20 Nov 2022 18:09:21 -0500 Subject: [PATCH] Put flot under MIT (#11603) Signed-off-by: Levi Harrison Signed-off-by: Levi Harrison --- .../src/vendor/flot/jquery.flot.crosshair.js | 14 ++++---------- web/ui/react-app/src/vendor/flot/jquery.flot.js | 14 ++++---------- .../src/vendor/flot/jquery.flot.selection.js | 12 ++++-------- .../react-app/src/vendor/flot/jquery.flot.stack.js | 14 ++++---------- .../react-app/src/vendor/flot/jquery.flot.time.js | 14 ++++---------- 5 files changed, 20 insertions(+), 48 deletions(-) diff --git a/web/ui/react-app/src/vendor/flot/jquery.flot.crosshair.js b/web/ui/react-app/src/vendor/flot/jquery.flot.crosshair.js index 0f161a5bc..c9f76022a 100644 --- a/web/ui/react-app/src/vendor/flot/jquery.flot.crosshair.js +++ b/web/ui/react-app/src/vendor/flot/jquery.flot.crosshair.js @@ -1,13 +1,7 @@ -/** - * - * THIS FILE WAS COPIED INTO PROMETHEUS FROM GRAFANA'S VENDORED FORK OF FLOT - * (LIVING AT https://github.com/grafana/grafana/tree/master/public/vendor/flot), - * WHICH CONTAINS FIXES FOR DISPLAYING NULL VALUES IN STACKED GRAPHS. THE ORIGINAL - * FLOT CODE WAS LICENSED UNDER THE MIT LICENSE AS STATED BELOW. ADDITIONAL - * CHANGES HAVE BEEN CONTRIBUTED TO THE GRAFANA FORK UNDER AN APACHE 2 LICENSE, SEE - * https://github.com/grafana/grafana/blob/master/license. - * - */ +/* +SPDX-License-Identifier: MIT +Source: https://github.com/grafana/grafana/blob/main/public/vendor/flot/jquery.flot.crosshair.js +*/ /* eslint-disable prefer-spread */ /* eslint-disable no-loop-func */ diff --git a/web/ui/react-app/src/vendor/flot/jquery.flot.js b/web/ui/react-app/src/vendor/flot/jquery.flot.js index 3173cb679..f336e83a1 100644 --- a/web/ui/react-app/src/vendor/flot/jquery.flot.js +++ b/web/ui/react-app/src/vendor/flot/jquery.flot.js @@ -1,13 +1,7 @@ -/** - * - * THIS FILE WAS COPIED INTO PROMETHEUS FROM GRAFANA'S VENDORED FORK OF FLOT - * (LIVING AT https://github.com/grafana/grafana/tree/master/public/vendor/flot), - * WHICH CONTAINS FIXES FOR DISPLAYING NULL VALUES IN STACKED GRAPHS. THE ORIGINAL - * FLOT CODE WAS LICENSED UNDER THE MIT LICENSE AS STATED BELOW. ADDITIONAL - * CHANGES HAVE BEEN CONTRIBUTED TO THE GRAFANA FORK UNDER AN APACHE 2 LICENSE, SEE - * https://github.com/grafana/grafana/blob/master/license. - * - */ +/* +SPDX-License-Identifier: MIT +Source: https://github.com/grafana/grafana/blob/main/public/vendor/flot/jquery.flot.js +*/ /* eslint-disable prefer-spread */ /* eslint-disable no-loop-func */ diff --git a/web/ui/react-app/src/vendor/flot/jquery.flot.selection.js b/web/ui/react-app/src/vendor/flot/jquery.flot.selection.js index deb35abb1..7fd0ee683 100644 --- a/web/ui/react-app/src/vendor/flot/jquery.flot.selection.js +++ b/web/ui/react-app/src/vendor/flot/jquery.flot.selection.js @@ -1,11 +1,7 @@ -/** - * - * THIS FILE WAS COPIED INTO PROMETHEUS FROM GRAFANA'S VENDORED FORK OF FLOT - * (LIVING AT https://github.com/grafana/grafana/tree/v7.5.8/public/vendor/flot). - * THE ORIGINAL FLOT CODE WAS LICENSED UNDER THE MIT LICENSE AS STATED BELOW. - * ADDITIONAL CHANGES HAVE BEEN CONTRIBUTED TO THE GRAFANA FORK UNDER AN - * APACHE 2 LICENSE, SEE https://github.com/grafana/grafana/blob/v7.5.8/LICENSE. - */ +/* +SPDX-License-Identifier: MIT +Source: https://github.com/grafana/grafana/blob/main/public/vendor/flot/jquery.flot.selection.js +*/ /* eslint-disable prefer-spread */ /* eslint-disable no-loop-func */ diff --git a/web/ui/react-app/src/vendor/flot/jquery.flot.stack.js b/web/ui/react-app/src/vendor/flot/jquery.flot.stack.js index 1c172d58f..98cf07ab8 100644 --- a/web/ui/react-app/src/vendor/flot/jquery.flot.stack.js +++ b/web/ui/react-app/src/vendor/flot/jquery.flot.stack.js @@ -1,13 +1,7 @@ -/** - * - * THIS FILE WAS COPIED INTO PROMETHEUS FROM GRAFANA'S VENDORED FORK OF FLOT - * (LIVING AT https://github.com/grafana/grafana/tree/master/public/vendor/flot), - * WHICH CONTAINS FIXES FOR DISPLAYING NULL VALUES IN STACKED GRAPHS. THE ORIGINAL - * FLOT CODE WAS LICENSED UNDER THE MIT LICENSE AS STATED BELOW. ADDITIONAL - * CHANGES HAVE BEEN CONTRIBUTED TO THE GRAFANA FORK UNDER AN APACHE 2 LICENSE, SEE - * https://github.com/grafana/grafana/blob/master/license. - * - */ +/* +SPDX-License-Identifier: MIT +Source: https://github.com/grafana/grafana/blob/main/public/vendor/flot/jquery.flot.stock.js +*/ /* eslint-disable prefer-spread */ /* eslint-disable no-loop-func */ diff --git a/web/ui/react-app/src/vendor/flot/jquery.flot.time.js b/web/ui/react-app/src/vendor/flot/jquery.flot.time.js index 7bce48724..04cb1803a 100644 --- a/web/ui/react-app/src/vendor/flot/jquery.flot.time.js +++ b/web/ui/react-app/src/vendor/flot/jquery.flot.time.js @@ -1,13 +1,7 @@ -/** - * - * THIS FILE WAS COPIED INTO PROMETHEUS FROM GRAFANA'S VENDORED FORK OF FLOT - * (LIVING AT https://github.com/grafana/grafana/tree/master/public/vendor/flot), - * WHICH CONTAINS FIXES FOR DISPLAYING NULL VALUES IN STACKED GRAPHS. THE ORIGINAL - * FLOT CODE WAS LICENSED UNDER THE MIT LICENSE AS STATED BELOW. ADDITIONAL - * CHANGES HAVE BEEN CONTRIBUTED TO THE GRAFANA FORK UNDER AN APACHE 2 LICENSE, SEE - * https://github.com/grafana/grafana/blob/master/license. - * - */ +/* +SPDX-License-Identifier: MIT +Source: https://github.com/grafana/grafana/blob/main/public/vendor/flot/jquery.flot.time.js +*/ /* eslint-disable prefer-rest-params */ /* eslint-disable no-useless-concat */