Update Dynamic Text Panel 2.1.0 and RSS/Atom Data Source 2.3.0 (#37)

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Update to Grafana 9.2.4 (#34)
 - Update Dynamic Text Panel 2.0.0 (#35)
 - Update to Grafana 9.3.1 (#36)
+- Update Dynamic Text Panel 2.1.0 and RSS/Atom Data Source 2.3.0 (#37)
 
 ## 1.4.0 (2022-10-29)
 

provisioning/dashboards/news.json

@@ -40,8 +40,13 @@
       },
       "id": 3,
       "options": {
-        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{media:group:media:thumbnail:url}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date updated 'MMM, DD YYYY'}} by {{author}}</b></td>\n</table>",
+        "content": "<table width=100% style='border:0'>\n  <tr>\n    <td style='border:0'>\n      <h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n    </td>\n    <td rowspan=2 style='border:0' width=200px>\n      <div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{media:group:media:thumbnail:url}}\">\n      </div>\n    </td>\n  </tr>\n  <tr>\n    <td style='border:0'><b>{{date updated 'MMM, DD YYYY'}} by {{author}}</b></td>\n</table>",
         "defaultContent": "The query didn't return any results.",
+        "editor": {
+          "format": "auto",
+          "height": 400,
+          "language": "html"
+        },
         "everyRow": true
       },
       "pluginVersion": "8.3.3",
@@ -88,8 +93,13 @@
       },
       "id": 2,
       "options": {
-        "content": "<table width=100% style='border:0'>\n<tr>\n<td style='border:0'><h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n{{{content:h4}}}</td>\n<td rowspan=2 style='border:0' width=200px>\n<div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{content:img-src}}\"></div></td>\n</tr>\n<tr>\n<td style='border:0'><b>{{date pubDate 'MMM, DD YYYY'}} by {{dc:creator}}</b></td>\n</table>",
+        "content": "<table width=100% style='border:0'>\n  <tr>\n    <td style='border:0'>\n      <h3><a target=\"_blank\" style=\"color: blue\" href=\"{{link}}\">{{title}}</a></h3>\n      <div>{{{content:h4}}}</div>\n    </td>\n    <td rowspan=2 style='border:0' width=200px>\n      <div style='max-width: 100%; display: inline; height: auto '><img width=200px src=\"{{content:img-src}}\"></div>\n    </td>\n  </tr>\n  <tr>\n    <td style='border:0'><b>{{date pubDate 'MMM, DD YYYY'}} by {{dc:creator}}</b></td>\n  </tr>\n</table>",
         "defaultContent": "The query didn't return any results.",
+        "editor": {
+          "format": "auto",
+          "height": 400,
+          "language": "html"
+        },
         "everyRow": true
       },
       "pluginVersion": "8.3.3",

src/marcusolsson-dynamictext-panel/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 2.1.0 (2022-11-27)
+
+### Breaking changes
+
+Refactoring may introduce breaking changes. Please test before upgrading in Production.
+
+### Features / Enhancements
+
+- Fix broken link in README (#111)
+- Update CI to upload signed artifacts (#113)
+- Add feature of parsing time formatting syntax (#86)
+- Fix data rendering when using transformations (#98)
+- Update Panel Options to Monaco Code Editor (#114)
+- Increase Test Coverage (#114)
+- Refactor and update images (#116)
+- Refactor Alert Message and Text Options (#117)
+- Add Support for Disable Sanitize HTML configuration (#118)
+
 ## 2.0.0 (2022-11-02)
 
 ### Breaking changes

src/marcusolsson-dynamictext-panel/MANIFEST.txt

@@ -8,32 +8,29 @@ Hash: SHA512
   "signedByOrg": "marcusolsson",
   "signedByOrgName": "Marcus Olsson",
   "plugin": "marcusolsson-dynamictext-panel",
-  "version": "2.0.0",
-  "time": 1667446139657,
+  "version": "2.1.0",
+  "time": 1669560123918,
   "keyId": "7e4d0c6a708866e7",
   "files": {
+    "CHANGELOG.md": "ae115bf79bd497281626a2773f97e2a21731009c667a15dc6d9b0e8f22b518f0",
     "module.js.LICENSE.txt": "e8c02c32db0a1df801e3d57aab9722d00cf899e5a1b469795e18d19dc3b9f1c4",
-    "module.js.map": "6b6a6bcf2a7a69d852fe5e9b36daf26a004030f1c543fb972902da5201cf0a6b",
-    "LICENSE": "a63c5165eb9778ded164326a26710064defbc9ffc295c8d49eda51bf9bd8f7d2",
-    "README.md": "2dc70a334777d7cca39465e51cdea4a7395d96ecfe85390b6ebabee8fda81df7",
-    "plugin.json": "f95317d85a672172c8e3ded91381bb016e555468f896496a363a1a3c0adbcadd",
-    "module.js": "51ad241d93d20fe46c4c939c75def328046b0952ffe4025f3f798e981ef133d1",
-    "CHANGELOG.md": "dda8a784cb59e45aa81c5a4ade708288d97f4e228e8e98bd994a672db9aa8fda",
-    "img/dark.png": "3090d8ff2e8fea50767d29b599de9a9da0d14356e285bf8fb23201c33179f308",
     "img/logo.svg": "655cfc72eec8d19bda8f74d9fa3449b7b133b5ee66c7bd3db407fdfeada1cbd1",
-    "img/product.png": "87d2911bd0fc95f18516941c28bbe060a75e7b1035f3ebd2428d388075751005",
-    "img/screenshot.png": "8dd0b4572cc1e0f017ab517135c4e723739175c051fdd11a24a5d8ba529ddfe8",
-    "img/light.png": "8106f6e3da841d04079e99907fb24714d4d6d84c514f6909ab5e446bb0f8bb4a"
+    "img/screenshot.png": "eadb1e588dccd558fa3aee74e1a4ffa7fab992d810de198dc230293528f8dd23",
+    "plugin.json": "93c59d3db6c7a5b65caf49da4373cffef76b5db96fd0f1feadc1080dc2647b29",
+    "module.js": "0bc49d3b8bcc98fc48b5d4c36307ec0c5447086af09445ca49acedd785908685",
+    "module.js.map": "112d9d377a990f3b004a52b61a3021263c2923d91d2dd088432b673817721215",
+    "LICENSE": "a63c5165eb9778ded164326a26710064defbc9ffc295c8d49eda51bf9bd8f7d2",
+    "README.md": "704d353d84ae0eca7d3f38cb7af84fdb32bed8a944ebcabb9bde8a92dcf5bfdd"
   }
 }
 -----BEGIN PGP SIGNATURE-----
 Version: OpenPGP.js v4.10.10
 Comment: https://openpgpjs.org
 
-wrgEARMKAAYFAmNjNXsAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
-cIhm5+oKAgjMzLUhu5JEBzZamndRa9T/Hcp/XdyPTL/HvdtaiSpH1Ln87ydN
-Ou5bmnbmeruir0Q7eai9hDOWzAJcJHHN8nY/BwIJAeRi2M7OEoPLYW1f8tRc
-A6GYlpR0rTUBz+w1kbRx1sjjIoMlFlHwHRrG5FBDi+N2KH670Z1yAvcUAYgX
-mzCa+EHp
-=p7hW
+wrgEARMKAAYFAmODdzwAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
+cIhm5yabAgjcMfnUR0k27bRKxKiW7fwpBAt/P5AYE/Dt3TAtnWt3VLzIGJAc
+ogYMFBcnJsJtVtGqczROGnZ2GtGrdaun4KLo4QIJAT0aYSTKGH35dzo4iWmt
+DW1RHjvgeMOQlfz52E+peIXnVM/AV29H29PMhiAZ1nmYU1kySLYrUcrqGekr
+i+V6zLpU
+=HhLi
 -----END PGP SIGNATURE-----

src/marcusolsson-dynamictext-panel/README.md

@@ -5,10 +5,11 @@
 [![Grafana](https://img.shields.io/badge/Grafana-9.2.2-orange)](https://www.grafana.com)
 ![CI](https://github.com/volkovlabs/volkovlabs-dynamictext-panel/workflows/CI/badge.svg)
 [![codecov](https://codecov.io/gh/VolkovLabs/volkovlabs-dynamictext-panel/branch/main/graph/badge.svg?token=0m6f0ktUar)](https://codecov.io/gh/VolkovLabs/volkovlabs-dynamictext-panel)
+[![CodeQL](https://github.com/VolkovLabs/volkovlabs-dynamictext-panel/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/VolkovLabs/volkovlabs-dynamictext-panel/actions/workflows/codeql-analysis.yml)
 
 ## Introduction
 
-A Dynamic Text panel is a plugin for Grafana for dynamic, data-driven text.
+A Dynamic Text panel is a plugin for Grafana for dynamic, data-driven text with Markdown and Handlebars support.
 
 While the built-in Text panel in Grafana does support variables, that's about as dynamic it gets. This panel lets you define a text template using the data from your data source query.
 
@@ -29,41 +30,53 @@ grafana-cli plugins install marcusolsson-dynamictext-panel
 
 ## Features
 
+- Uses Monaco Code Editor with Auto formatting to update Templates.
 - Supports [Markdown](https://commonmark.org/help/) and [Handlebars](https://handlebarsjs.com/guide/expressions.html#basic-usage).
 - Uses [markdown-it](https://github.com/markdown-it/markdown-it) for rendering Markdown to HTML.
-- HTML inside templates is sanitized using [XSS](https://jsxss.com/en/index.html) through [textUtil](https://grafana.com/docs/grafana/latest/packages_api/data/textutil/).
+- HTML inside templates is sanitized using [XSS](https://jsxss.com/en/index.html) through `textUtil`.
+- Allows to display Time global variables (`__to` and `__from`) as seconds, ISO, and formatted using `dayjs`.
+- Supports disable Sanitizing using Grafana configuration `disable_sanitize_html`.
 
-## Panel Options
+## Content
 
-### Content
+To display data from your query result, enter the name of the field surrounded by double braces. For example, to display the value from the `Time` field:
 
-A [Handlebars](https://handlebarsjs.com/) template with support for Markdown.
+```
+{{Time}}
+```
 
-To use display data from your query result, enter the name of the field surrounded by double braces. For example, to display the value from the `Time` field, enter `{{Time}}`.
+Panels renders the template for every row in the query result. If a query returns multiple query results, you can select the query result you wish to display from a drop-down menu.
 
-Grafana renders the template for every row in the query result. If a query returns multiple query results, you can select the query result you wish to display from a drop-down menu.
+Template support text processing using one or more helpers and recipies:
 
-You can even do basic text processing using one or more [helpers](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/helpers) inside your template.
+- [Helpers](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/helpers) - functions that let you perform text transformation within your template.
+- [Recipes](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/recipes) - useful snippets that you can use in your templates.
 
-### Default content
+The panel renders Handlebars → Markdown → Sanitized HTML and displays the final result.
 
-Whenever the data source query returns an empty result, Grafana displays the template in **Default content** instead of **Content**.
+### Default content
 
-This can be useful to provide users with instructions on what to do, or who to contact, when the query returns an empty result.
+Whenever the data source query returns an empty result, Grafana displays the template in **Default content**. This can be useful to provide users with instructions on what to do, or who to contact, when the query returns an empty result.
 
 Even though there's no data from the data source, you can still use the available [helpers](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/helpers).
 
-### Every row
+### Sanitizing
 
-By default, the template configured in the **Content** field is rendered for each record in the result.
+Sanitizing is enabled by default and some elements like `<button>` are unavailable in the content.
 
-You can render this template only once by turning this switch off. In this case, the query results are passed in as the `data` field to the template.
+To disable sanitizing, panel depends on the Grafana configuration option [`disable_sanitize_html`](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#disable_sanitize_html). For Docker container and Docker Compose, use as:
 
-Handlebars provides a [builtin-helper](https://handlebarsjs.com/guide/builtin-helpers.html#each) to iterate over these records.
+```bash
+- GF_PANELS_DISABLE_SANITIZE_HTML=true
+```
 
-## Example
+## Every row vs All rows
 
-Let's say that your data source returns the following data:
+By default, the template configured in the **Content** field is rendered for each record in the result. You can render this template only once by selecting `All rows`. In this case, the query results are passed in as the `data` field to the template.
+
+Handlebars provides a [builtin-helper](https://handlebarsjs.com/guide/builtin-helpers.html#each) to iterate over these records.
+
+If your data source returns the following data:
 
 ```md
 | app  | description                  | cluster | tier     |
@@ -79,17 +92,10 @@ You can then write Markdown with placeholders for the data you want to use. The
 {{description}}
 
 {{#if (eq tier "frontend")}}
-https://{{cluster}}.example.com/{{app}}
+Link: <a href='https://{{cluster}}.example.com/{{app}}'>https://{{cluster}}.example.com/{{app}}</a>
 {{/if}}
 ```
 
-The panel renders Handlebars → Markdown → HTML and displays the final result.
-
-For more examples, take a look at
-
-- [Helpers](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/helpers) - functions that let you perform basic text transformation within your template.
-- [Recipes](https://volkovlabs.io/plugins/volkovlabs-dynamictext-panel/recipes) - useful snippets that you can use in your templates.
-
 ## Feedback
 
 We love to hear from users, developers, and the whole community interested in this plugin. These are various ways to get in touch with us:

src/marcusolsson-dynamictext-panel/plugin.json

@@ -10,7 +10,7 @@
       "name": "Volkov Labs",
       "url": "https://volkovlabs.io"
     },
-    "description": "Data-driven text with Markdown support",
+    "description": "Data-driven text with Markdown and Handlebars support",
     "keywords": ["text", "markdown", "handlebars"],
     "links": [
       {
@@ -36,8 +36,8 @@
         "path": "img/screenshot.png"
       }
     ],
-    "updated": "2022-11-03",
-    "version": "2.0.0"
+    "updated": "2022-11-27",
+    "version": "2.1.0"
   },
   "name": "Dynamic Text",
   "type": "panel"

src/volkovlabs-rss-datasource/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.3.0 (2022-11-16)
+
+### Features / Enhancements
+
+- Update to Grafana 9.1.4 (#36)
+- Add Compatibility Check Workflow (#37)
+- Update CI to Node 16 and Synchronize with Release workflow (#39)
+- Update to Grafana 9.2.2 (#40)
+- Update CI to upload signed artifacts (#41)
+
 ## 2.2.0 (2022-08-25)
 
 ### Features / Enhancements

src/volkovlabs-rss-datasource/MANIFEST.txt

@@ -8,30 +8,30 @@ Hash: SHA512
   "signedByOrg": "volkovlabs",
   "signedByOrgName": "Volkov Labs",
   "plugin": "volkovlabs-rss-datasource",
-  "version": "2.2.0",
-  "time": 1661434831363,
+  "version": "2.3.0",
+  "time": 1668652560972,
   "keyId": "7e4d0c6a708866e7",
   "files": {
     "module.js.LICENSE.txt": "cdf963ced7d25a0f98901a547647b4d6e2dbe0197fd78c87a059a87b0e542fe2",
+    "module.js.map": "0a2d3a8d84689e75ce5c234fe4ad484f23ff3e5cc49bb40b44e0a584b2611c9a",
+    "LICENSE": "eab40c95a247a65cd1bd40aa9b7c908d0a95259b30255924c401d159fd21b4d4",
+    "README.md": "e176caebccbceb016e22be0180832c923bb4f553d8589d91e3bba04f86c0cb20",
+    "plugin.json": "30af8812b185a3e797d826664b746b37e29de22426e16cc64128e84bb279769a",
+    "module.js": "ba5c7fa9dffe392469f88460e23a425f66661733423de114c64d22293f8103ff",
+    "CHANGELOG.md": "3c3e1741fe6ca916d7aab0e3b3e6f228e2e0e0eaaca1e459436bd938e69302c0",
     "img/dashboard.png": "a64cfd0726b8e298b0ae244591eec9ddb47f73f7f14e0a37b77a6ef1a8e36417",
     "img/logo.svg": "6ae264f737744d5519c1d0671f08b6833e73c570ba51542760382a20868d91d0",
-    "img/panel.png": "de79d1a2dadf61c59796663d79b43b9813e64a7721de3c67872d0000105265fb",
-    "module.js": "3ba54698456a8ab8fa0adb3e3203d6e2bfae43cce091c6165a707797b6f7d467",
-    "module.js.map": "58f845df33523daee11dc57495203efd463be1e978dae0df4959147546d06c73",
-    "LICENSE": "eab40c95a247a65cd1bd40aa9b7c908d0a95259b30255924c401d159fd21b4d4",
-    "README.md": "3d218ffa4b3e8b3d1830e1fac43dcf0d3ab43de62c9e991582b3c99cefb3ac99",
-    "plugin.json": "2a109b4feaf9389535e6223992596e5695185c356c4221a0dd00ad597f606865",
-    "CHANGELOG.md": "75bcaaada2aded319e2ea853ff1163ae9f9b8c6518b773624773ef9811fd9f6e"
+    "img/panel.png": "de79d1a2dadf61c59796663d79b43b9813e64a7721de3c67872d0000105265fb"
   }
 }
 -----BEGIN PGP SIGNATURE-----
 Version: OpenPGP.js v4.10.10
 Comment: https://openpgpjs.org
 
-wrkEARMKAAYFAmMHe88AIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
-cIhm5/kSAgkB/5liP8H240bG9ZrTKe46DkRkJXplNAw74DURr89gnaivMB4z
-MysTQ9kJm3jswSpApDpmsKl7HvA8XdRjNGqRXTACCQHnh5Udd1MLFDL562Od
-g1dSiYxXFcoa+3aEr/ZgxgktIKou6Nc9q2/Ypa+u8oeLKe+UQE8il5z6JBUD
-Uhd9tXdaYg==
-=ys8V
+wrkEARMKAAYFAmN1nhEAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
+cIhm582pAgkBw0TimZ5rMoHJ4h1y5Ekju6lg+vehki8NC0kwO7jPe6fj0cc4
+KkXaYob+An0YH7c2MmeBz9d6eeFXqMV6FjqIKMwCCQHBXqjpGmuz0LHVZ9+w
+RDmLtASfpvLzOgW3IEvaD6yef8FVWSGWUkO1OyNr0aUO8rMC7n/g7b55BaCV
+zAbPY2NZEA==
+=RdAM
 -----END PGP SIGNATURE-----

src/volkovlabs-rss-datasource/README.md

@@ -1,12 +1,12 @@
-# RSS/Atom data source plugin for Grafana
+# RSS/Atom Data Source for Grafana
 
 ![Dashboard](https://raw.githubusercontent.com/VolkovLabs/volkovlabs-rss-datasource/main/src/img/dashboard.png)
 
-[![Grafana 9](https://img.shields.io/badge/Grafana-9.1.1-orange)](https://www.grafana.com)
-[![RSS/Atom](https://img.shields.io/badge/dynamic/json?color=blue&label=RSS%2FAtom%20Data%20Source&query=%24.version&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins%2Fvolkovlabs-rss-datasource)](https://grafana.com/grafana/plugins/volkovlabs-rss-datasource)
+[![Grafana 9](https://img.shields.io/badge/Grafana-9.2.2-orange)](https://www.grafana.com)
+[![YouTube](https://img.shields.io/badge/YouTube-Playlist-red)](https://www.youtube.com/playlist?list=PLPow72ygztmSGfvGdXriFE-LVuS4Glg7w)
 ![CI](https://github.com/volkovlabs/volkovlabs-rss-datasource/workflows/CI/badge.svg)
 [![codecov](https://codecov.io/gh/VolkovLabs/volkovlabs-rss-datasource/branch/main/graph/badge.svg?token=2W9VR0PG5N)](https://codecov.io/gh/VolkovLabs/volkovlabs-rss-datasource)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/VolkovLabs/volkovlabs-rss-datasource.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/VolkovLabs/volkovlabs-rss-datasource/context:javascript)
+[![CodeQL](https://github.com/VolkovLabs/volkovlabs-rss-datasource/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/VolkovLabs/volkovlabs-rss-datasource/actions/workflows/codeql-analysis.yml)
 
 ## Introduction
 
@@ -21,7 +21,7 @@ The RSS/Atom data source is a plugin for Grafana that retrieves RSS/Atom feeds a
 
 ## Getting Started
 
-RSS/Atom data source can be installed from the Grafana Marketplace or use the `grafana-cli` tool to install from the command line:
+RSS/Atom data source can be installed from the [Grafana Catalog](https://grafana.com/grafana/plugins/volkovlabs-rss-datasource/) or use the `grafana-cli` tool to install from the command line:
 
 ```bash
 grafana-cli plugins install volkovlabs-rss-datasource
@@ -70,14 +70,9 @@ GF_PANELS_DISABLE_SANITIZE_HTML=true
 We love to hear from users, developers, and the whole community interested in this plugin. These are various ways to get in touch with us:
 
 - Ask a question, request a new feature, and file a bug with [GitHub issues](https://github.com/volkovlabs/volkovlabs-rss-datasource/issues/new/choose).
+- Sponsor our open-source plugins for Grafana with [GitHub Sponsor](https://github.com/sponsors/VolkovLabs).
 - Star the repository to show your support.
 
-## Contributing
-
-- Fork the repository.
-- Find an issue to work on and submit a pull request.
-- Could not find an issue? Look for documentation, bugs, typos, and missing features.
-
 ## License
 
 - Apache License Version 2.0, see [LICENSE](https://github.com/volkovlabs/volkovlabs-rss-datasource/blob/main/LICENSE).

src/volkovlabs-rss-datasource/plugin.json

@@ -11,9 +11,13 @@
       "name": "Volkov Labs",
       "url": "https://volkovlabs.io"
     },
-    "description": "RSS/Atom datasource plugin for Grafana",
+    "description": "RSS/Atom data source plugin for Grafana",
     "keywords": ["rss", "atom", "news"],
     "links": [
+      {
+        "name": "GitHub",
+        "url": "https://github.com/VolkovLabs/volkovlabs-rss-datasource"
+      },
       {
         "name": "Website",
         "url": "https://volkovlabs.io"
@@ -33,8 +37,8 @@
         "path": "img/panel.png"
       }
     ],
-    "updated": "2022-08-25",
-    "version": "2.2.0"
+    "updated": "2022-11-17",
+    "version": "2.3.0"
   },
   "metrics": true,
   "name": "RSS/Atom",