Fix plugin.json, update build file, update screenshot links, remove u…

…nnecessary screenshots. (#17)

.gitignore

@@ -32,6 +32,7 @@ node_modules
 dist/oci-plugin_*
 coverage/
 dist/
+oci-logs-datasource/
 *_orig
 .idea
 

README.md

@@ -13,6 +13,7 @@ you a single pane of glass for your application monitoring needs.
 
 For custom logs from your application, see [Custom Logging on OCI][2].
 
+![OCI Logs Plugin](docs/images/OCI_Logs.png?raw=true)
 ## Prerequisites
 
 We will discuss two different Grafana IAM configurations that needs to be in
@@ -88,7 +89,7 @@ Oracle Cloud Infrastructure services. Add the following policy statements:
 
 ## Documentation
 
- Please refer to the [docs folder in this GitHub repository](./docs)
+ Please refer to the [docs folder in this GitHub repository](https://github.com/oracle/oci-grafana-logs/tree/main/docs)
 
 ## Help
 
@@ -98,11 +99,11 @@ Issues and questions about this plugin can be posted
 ## Contributing
 
 This project welcomes contributions from the community. Before submitting a pull
-request, please [review our contribution guide](./CONTRIBUTING.md).
+request, please [review our contribution guide](https://github.com/oracle/oci-grafana-logs/blob/main/CONTRIBUTING.md).
 
 ## Security
 
-Please consult the [security guide](./SECURITY.md) for our responsible security
+Please consult the [security guide](https://github.com/oracle/oci-grafana-logs/blob/main/SECURITY.md) for our responsible security
 vulnerability disclosure process.
 
 ## License

build.sh

@@ -6,7 +6,7 @@ if [[ ! -d ./node_modules ]]; then
   echo "dependencies not installed try running: npm install"
   exit 1
 fi
-
+rm -rf ./oci-logs-datasource
 ./node_modules/.bin/grunt
 
 # build go
@@ -44,8 +44,10 @@ echo "building go binary"
 GOOS=$GOOS go build -o ./dist/oci-logs-plugin$POST
 GOOS=linux go build -o ./dist/oci-logs-plugin_linux_amd64
 GOOS=windows GOARCH=amd64 go build -o ./dist/oci-logs-plugin_windows_amd64.exe
-tar cvf plugin.tar ./dist
-zip -r oci-logs-datasource ./dist
+grafana-toolkit plugin:sign
+mv ./dist ./oci-logs-datasource
+tar cvf plugin.tar ./oci-logs-datasource
+zip -r oci-logs-datasource ./oci-logs-datasource
 
 # Instructions for signing
 # Please make sure

package.json

@@ -1,7 +1,7 @@
 {
   "name": "oci-grafana-logs",
   "private": true,
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {

src/plugin.json

@@ -2,18 +2,12 @@
   "name": "Oracle Cloud Infrastructure Logs",
   "id": "oci-logs-datasource",
   "type": "datasource",
-
-  "partials": {
-    "config": "public/app/plugins/datasource/oracle-oci-datasource/partials/config.html"
-  },
-
   "metrics": true,
   "annotations": false,
   "alerting": false,
   "backend": true,
   "executable": "oci-logs-plugin",
   "logs": true,
-
   "info": {
     "description": "Oracle Cloud Infrastructure Logs Data Source for Grafana",
     "author": {
@@ -24,15 +18,20 @@
       "large": "img/Oracle-cloud.svg"
     },
     "links": [
-      {"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-plugin"},
+      {"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-logs"},
       {"name": "UPL", "url": "https://oss.oracle.com/licenses/upl"}
     ],
-    "version": "2.0.0",
-    "updated": "2022-02-24"
+    "version": "2.0.1",
+    "updated": "2022-03-16",
+    "screenshots":[
+      {
+        "name":"OCI Logs Dashboard",
+        "path":"docs/images/OCI_Logs.png"
+      }
+    ]
   },
-
   "dependencies": {
-    "grafanaVersion": ">=8.0.0",
-    "plugins": [ ]
+    "grafanaDependency": ">=8.0.0",
+    "plugins": []
   }
 }