Fixed node-notifier security issue and rebuilt lock files #4

athulmurali · 2021-02-04T00:04:21Z

Upgraded node notifier version and added to dependencies to fix the security issue
Removed the previous yarn.lock and package-lock.json files and rebuilt them
Minor change : updated the package name in package.json
Updated version numbers and plugin json for release in grafana

Test the PR with the following plugin build tar file
1.1.3 Beta Release

Todo : After merge

Update the release page
Sign and Upload the new plugin version to https://grafana.com/grafana/plugins/oci-logs-datasource
Update github link in Grafana logs plugin page

Replicate the same in oci-grafana-metrics repo

Djelibeybi

All of your manual installs appear to be (almost) identical. I would create a single "Manual install" page instead.

Also, GitHub has a latest URL for releases which you can use instead of having to change the URL every time in your docs. But you need to actually release something first.

Djelibeybi · 2021-02-04T01:12:48Z

docs/linux.md

@@ -42,7 +42,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

 ### Manual installation 
-Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v1.1.2/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
+Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v1.1.3/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 


Instead of having to update this every time you release a new version, just use the latest URL instead.

Also noticed that the url is wrong.

Do we need this line since the releases widget has been added to the landing page of github repos ?

I wouldn't have thought so. Just document how to use the latest release.

Djelibeybi · 2021-02-04T01:12:55Z

docs/linuxoci.md

@@ -35,7 +35,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

 ### Manually installation 
-Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/V1.1.2/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
+Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v1.1.3/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 


Instead of having to update this every time you release a new version, just use the latest URL instead.

Djelibeybi · 2021-02-04T01:13:06Z

docs/linuxoci.md

@@ -35,7 +35,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

 ### Manually installation 


This should be "Manual installation"

Thanks for bringing this up. Just noticed

Djelibeybi · 2021-02-04T01:13:20Z

docs/macos.md

@@ -40,7 +40,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

 ### Manually installation 


This should be "Manual installation"

Djelibeybi · 2021-02-04T01:13:25Z

docs/macos.md

@@ -40,7 +40,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

 ### Manually installation 
- Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v1.1.2/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`
+ Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v1.1.3/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`


Instead of having to update this every time you release a new version, just use the latest URL instead.

- Updated url with new repo name and version with latest to avoid repeated edits - Minor typo fixes

athulmurali · 2021-02-05T01:28:03Z

All of your manual installs appear to be (almost) identical. I would create a single "Manual install" page instead.

Also, GitHub has a latest URL for releases which you can use instead of having to change the URL every time in your docs. But you need to actually release something first.

I tried to replace the version with latest keyword in the url of the other repo. It fails. Can please point out what am I doing wrong here ? @Djelibeybi

✘-8 ~/Downloads
17:23 $ wget https://github.com/oracle/oci-grafana-metrics/releases/download/v2.2.3-beta/plugin.tar
--2021-02-04 17:24:18--  https://github.com/oracle/oci-grafana-metrics/releases/download/v2.2.3-beta/plugin.tar
Resolving www-proxy-hqdc.us.oracle.com (XXXX)...
Connecting to www-proxy-hqdc.us.oracle.com (XXXXXXX)... connected.
Proxy request sent, awaiting response... 302 Foun

plugin.tar                             9%[=====>                                                                ]   5.52M   167KB/s    eta 2m 18s ^C
✘-INT ~/Downloads
17:24 $ wget https://github.com/oracle/oci-grafana-metrics/releases/download/latest/plugin.tar
--2021-02-04 17:24:42--  https://github.com/oracle/oci-grafana-metrics/releases/download/latest/plugin.tar
Resolving www-proxy-hqdc.us.oracle.com (XXXXXX)... 10.68.69.53
Connecting to www-proxy-hqdc.us.oracle.com (XXXX.... connected.
Proxy request sent, awaiting response... 404 Not Found
2021-02-04 17:24:43 ERROR 404: Not Found.

Djelibeybi · 2021-02-05T01:43:54Z

I tried to replace the version with latest keyword in the url of the other repo. It fails. Can please point out what am I doing wrong here ? @Djelibeybi

Docs are here: https://docs.github.com/en/github/administering-a-repository/linking-to-releases#linking-to-the-latest-release

I suspect it's not working because this repo doesn't have a proper release yet, just a pre-release. But that's a guess.

athulmurali · 2021-02-08T21:56:24Z

This works

13:53 $ wget https://github.com/oracle/oci-grafana-logs/releases/latest/download/plugin.tar
--2021-02-08 13:53:15-- https://github.com/oracle/oci-grafana-logs/releases/latest/download/plugin.tar
Resolving XXXXXXXXXX
Connecting to www-proxy-XXXXXXXXXXX... connected.
Proxy request sent, awaiting response... 302 Found
Location: https://github.com/oracle/oci-grafana-logs/releases/download/v1.1.3-beta/plugin.tar [following]
--2021-02-08 13:53:16-- https://github.com/oracle/oci-grafana-logs/releases/download/v1.1.3-beta/plugin.tar
Reusing existing connection to github.com:443.
Proxy request sent, awaiting response... 302 Found
Location: https://github-releases.githubusercontent.com/XXXXXX
Connecting to XXXXXXXXXXXX.. connected.

plugin.tar 100%[=========================================================================>] 56.52M 603KB/s in 56s

athulmurali requested review from Djelibeybi, VadimKomar and DmitryMarkovski February 4, 2021 00:04

Fixed the issue and rebuilt lock files

04d0833

athulmurali force-pushed the am/security-fix/node-notifier branch from 2026ff6 to 04d0833 Compare February 4, 2021 00:18

athulmurali added 3 commits February 3, 2021 16:27

Updated version numbers in doc

64f1a6f

updated plugin.json file to reflect the version and date updates

c8e6430

rebuilt lock files again

7c46ad9

athulmurali changed the title ~~Fixed the issue and rebuilt lock files~~ Fixed node-notifier security issue and rebuilt lock files Feb 4, 2021

Djelibeybi requested changes Feb 4, 2021

View reviewed changes

Updated docs

031f643

- Updated url with new repo name and version with latest to avoid repeated edits - Minor typo fixes

Fixed urls for wget

1a16249

Djelibeybi approved these changes Feb 9, 2021

View reviewed changes

athulmurali merged commit 08d0f76 into main Feb 12, 2021

athulmurali mentioned this pull request Feb 16, 2021

Fix docs oracle/oci-grafana-metrics#83

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed node-notifier security issue and rebuilt lock files #4

Fixed node-notifier security issue and rebuilt lock files #4

athulmurali commented Feb 4, 2021 •

edited

Loading

Djelibeybi left a comment

Djelibeybi Feb 4, 2021

athulmurali Feb 4, 2021

Djelibeybi Feb 4, 2021

Djelibeybi Feb 4, 2021

Djelibeybi Feb 4, 2021

athulmurali Feb 4, 2021

Djelibeybi Feb 4, 2021

Djelibeybi Feb 4, 2021

athulmurali commented Feb 5, 2021 •

edited

Loading

Djelibeybi commented Feb 5, 2021

athulmurali commented Feb 8, 2021 •

edited

Loading

		@@ -35,7 +35,7 @@ grafana-cli plugins install oci-datasource
		The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

		### Manually installation

		@@ -40,7 +40,7 @@ grafana-cli plugins install oci-datasource
		The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).

		### Manually installation

Fixed node-notifier security issue and rebuilt lock files #4

Fixed node-notifier security issue and rebuilt lock files #4

Conversation

athulmurali commented Feb 4, 2021 • edited Loading

Djelibeybi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

athulmurali commented Feb 5, 2021 • edited Loading

Djelibeybi commented Feb 5, 2021

athulmurali commented Feb 8, 2021 • edited Loading

athulmurali commented Feb 4, 2021 •

edited

Loading

athulmurali commented Feb 5, 2021 •

edited

Loading

athulmurali commented Feb 8, 2021 •

edited

Loading