Update logs plugin documentation pages (#39)

oracle · Aug 20, 2022 · 6edb24b · 6edb24b
1 parent ad802b1
commit 6edb24b
Show file tree

Hide file tree

Showing 116 changed files with 327 additions and 209 deletions.
diff --git a/README.md b/README.md
@@ -4,12 +4,13 @@
 
 Grafana is a popular technology that makes it easy to visualize metrics and logs.
 The OCI Logging Grafana Plugin can be used to extend Grafana by adding
-[Oracle Cloud Logging][1] as a data source in Grafana.
+[Oracle Cloud Infrastructure Logging][1] as a data source in Grafana.
 
 The plugin allows you to retrieve logs related to a number of resources on
-Oracle Cloud: Compute, Networking, Storage, and custom logs from your application.
-Once these logs are in Grafana, they can be analysed along with metrics, giving
-you a single pane of glass for your application monitoring needs.
+Oracle Cloud: Compute, Networking, Storage, custom logs from your application,
+and audit logs generated by Oracle Cloud services. Once these logs are in Grafana,
+they can be analysed along with metrics, giving you a single pane of glass for your
+application monitoring needs.
 
 For custom logs from your application, see [Custom Logging on OCI][2].
 ## Prerequisites
@@ -49,6 +50,7 @@ policy statements:
 
 - `allow group GrafanaLoggingUserGroup to read log-groups in tenancy`
 - `allow group GrafanaLoggingUserGroup to read log-content in tenancy`
+- `allow group GrafanaLoggingUserGroup to read compartments in tenancy`
 
 ![alt text](https://github.com/oracle/oci-grafana-logs/blob/main/docs/images/usrPolicy.png?raw=true)
 
@@ -82,6 +84,7 @@ Oracle Cloud Infrastructure services. Add the following policy statements:
 
 - `allow dynamicgroup DynamicGroupForGrafanaInstances to read log-groups in tenancy`
 - `allow dynamicgroup DynamicGroupForGrafanaInstances to read log-content in tenancy`
+- `allow dynamicgroup DynamicGroupForGrafanaInstances to read compartments in tenancy`
 
 ![alt text](https://github.com/oracle/oci-grafana-logs/blob/main/docs/images/dgPolicy.png?raw=true)
 

diff --git a/docs/images/Grafana-AddDataSource-Screenshot.png b/docs/images/Grafana-AddDataSource-Screenshot.png
diff --git a/docs/images/Grafana-ChangeDefaultAdminPassword-Screenshot.png b/docs/images/Grafana-ChangeDefaultAdminPassword-Screenshot.png
diff --git a/docs/images/Grafana-ConfigurationPluginsMenu-Screenshot.png b/docs/images/Grafana-ConfigurationPluginsMenu-Screenshot.png
diff --git a/docs/images/Grafana-ConfigurationPluginsSearch-Screenshot.png b/docs/images/Grafana-ConfigurationPluginsSearch-Screenshot.png
diff --git a/docs/images/Grafana-ConfigurationPluginsWindow-Screenshot.png b/docs/images/Grafana-ConfigurationPluginsWindow-Screenshot.png
diff --git a/docs/images/Grafana-CreateDashboardMenu-Screenshot.png b/docs/images/Grafana-CreateDashboardMenu-Screenshot.png
diff --git a/docs/images/Grafana-CreateDashboardWindow-Screenshot.png b/docs/images/Grafana-CreateDashboardWindow-Screenshot.png
diff --git a/docs/images/Grafana-DataSourceSearch-Screenshot.png b/docs/images/Grafana-DataSourceSearch-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-Apply-Screenshot.png b/docs/images/Grafana-NewPanelEditor-Apply-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-DataSource-Screenshot.png b/docs/images/Grafana-NewPanelEditor-DataSource-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-PanelTitle-Screenshot.png b/docs/images/Grafana-NewPanelEditor-PanelTitle-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-PanelType-Screenshot.png b/docs/images/Grafana-NewPanelEditor-PanelType-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-QueryBox-Screenshot.png b/docs/images/Grafana-NewPanelEditor-QueryBox-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-Region-Screenshot.png b/docs/images/Grafana-NewPanelEditor-Region-Screenshot.png
diff --git a/docs/images/Grafana-NewPanelEditor-TablePanelType-Screenshot.png b/docs/images/Grafana-NewPanelEditor-TablePanelType-Screenshot.png
diff --git a/docs/images/Grafana-OCILogsPluginConfigWindow-Screenshot.png b/docs/images/Grafana-OCILogsPluginConfigWindow-Screenshot.png
diff --git a/docs/images/Grafana-OCILogsPluginInstallWindow-Screenshot.png b/docs/images/Grafana-OCILogsPluginInstallWindow-Screenshot.png
diff --git a/docs/images/Grafana-OCILogsPluginInstalled-Screenshot.png b/docs/images/Grafana-OCILogsPluginInstalled-Screenshot.png
diff --git a/docs/images/Grafana-SelectOCILogsDataSource-Screenshot.png b/docs/images/Grafana-SelectOCILogsDataSource-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-EndResult-Screenshot.png b/docs/images/Grafana-TablePanel-EndResult-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-ExtractFieldsFormat-Screenshot.png b/docs/images/Grafana-TablePanel-ExtractFieldsFormat-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-ExtractFieldsResult-Screenshot.png b/docs/images/Grafana-TablePanel-ExtractFieldsResult-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-ExtractFieldsSource-Screenshot.png b/docs/images/Grafana-TablePanel-ExtractFieldsSource-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-Screenshot.png b/docs/images/Grafana-TablePanel-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-Xform-Screenshot.png b/docs/images/Grafana-TablePanel-Xform-Screenshot.png
diff --git a/docs/images/Grafana-TablePanel-XformSelection-Screenshot.png b/docs/images/Grafana-TablePanel-XformSelection-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-BackToVarsScreen-Screenshot.png b/docs/images/Grafana-TemplateVars-BackToVarsScreen-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-DashboardSettingsIcon-Screenshot.png b/docs/images/Grafana-TemplateVars-DashboardSettingsIcon-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-DashboardSettingsScreen-Screenshot.png b/docs/images/Grafana-TemplateVars-DashboardSettingsScreen-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-ExampleDropdown-Screenshot.png b/docs/images/Grafana-TemplateVars-ExampleDropdown-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-IntervalVarConfig-Screenshot.png b/docs/images/Grafana-TemplateVars-IntervalVarConfig-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-OfficialVars-Screenshot.png b/docs/images/Grafana-TemplateVars-OfficialVars-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-PanelEditor-Screenshot.png b/docs/images/Grafana-TemplateVars-PanelEditor-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-PanelEditorWithVars-Screenshot.png b/docs/images/Grafana-TemplateVars-PanelEditorWithVars-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-Regions-Screenshot.png b/docs/images/Grafana-TemplateVars-Regions-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-SelectionOptions-Screenshot.png b/docs/images/Grafana-TemplateVars-SelectionOptions-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-VariablesScreen-NewVar-Screenshot.png b/docs/images/Grafana-TemplateVars-VariablesScreen-NewVar-Screenshot.png
diff --git a/docs/images/Grafana-TemplateVars-VariablesScreen-Screenshot.png b/docs/images/Grafana-TemplateVars-VariablesScreen-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-AliasesExample1-Screenshot.png b/docs/images/Grafana-TimeSeries-AliasesExample1-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-CustomQueryOptionsExample-Screenshot.png b/docs/images/Grafana-TimeSeries-CustomQueryOptionsExample-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-ExampleGraph-Screenshot.png b/docs/images/Grafana-TimeSeries-ExampleGraph-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-GroupByExample1-Screenshot.png b/docs/images/Grafana-TimeSeries-GroupByExample1-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-GroupByExample2-Screenshot.png b/docs/images/Grafana-TimeSeries-GroupByExample2-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-PanelOptions-Screenshot.png b/docs/images/Grafana-TimeSeries-PanelOptions-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-PluginIntervalExample-Screenshot.png b/docs/images/Grafana-TimeSeries-PluginIntervalExample-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-QueryOptions-Screenshot.png b/docs/images/Grafana-TimeSeries-QueryOptions-Screenshot.png
diff --git a/docs/images/Grafana-TimeSeries-rounddownExample-Screenshot.png b/docs/images/Grafana-TimeSeries-rounddownExample-Screenshot.png
diff --git a/docs/images/GrafanaHomePage-Screenshot.png b/docs/images/GrafanaHomePage-Screenshot.png
diff --git a/docs/images/GrafanaLogin-Screenshot.png b/docs/images/GrafanaLogin-Screenshot.png
diff --git a/docs/images/OCIConsole-DynamicGroupList-Screenshot.png b/docs/images/OCIConsole-DynamicGroupList-Screenshot.png
diff --git a/docs/images/OCIConsole-GroupList-Screenshot.png b/docs/images/OCIConsole-GroupList-Screenshot.png
diff --git a/docs/images/OCIConsole-GroupLogsPolicyCreate-Screenshot.png b/docs/images/OCIConsole-GroupLogsPolicyCreate-Screenshot.png
diff --git a/docs/images/OCIConsole-PoliciesList-Screenshot.png b/docs/images/OCIConsole-PoliciesList-Screenshot.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.23.46 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.23.46 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.23.54 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.23.54 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.24.02 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.24.02 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.24.13 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.24.13 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.24.17 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.24.17 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.24.24 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.24.24 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.24.29 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.24.29 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.25.33 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.25.33 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.26.01 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.26.01 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.26.18 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.26.18 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.26.23 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.26.23 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.26.26 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.26.26 PM.png
diff --git a/docs/images/Screen Shot 2018-12-17 at 3.27.53 PM.png b/docs/images/Screen Shot 2018-12-17 at 3.27.53 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 1.57.02 PM.png b/docs/images/Screen Shot 2018-12-19 at 1.57.02 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 3.00.10 PM.png b/docs/images/Screen Shot 2018-12-19 at 3.00.10 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 3.02.31 PM.png b/docs/images/Screen Shot 2018-12-19 at 3.02.31 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 4.18.19 PM.png b/docs/images/Screen Shot 2018-12-19 at 4.18.19 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 4.18.32 PM.png b/docs/images/Screen Shot 2018-12-19 at 4.18.32 PM.png
diff --git a/docs/images/Screen Shot 2018-12-19 at 5.20.58 PM.png b/docs/images/Screen Shot 2018-12-19 at 5.20.58 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.17.47 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.17.47 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.18.08 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.18.08 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.19.08 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.19.08 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.19.14 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.19.14 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.20.23 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.20.23 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.21.52 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.21.52 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.22.47 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.22.47 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.23.15 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.23.15 PM.png
diff --git a/docs/images/Screen Shot 2018-12-20 at 2.24.12 PM.png b/docs/images/Screen Shot 2018-12-20 at 2.24.12 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.00.28 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.00.28 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.02.33 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.02.33 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.02.36 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.02.36 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.03.04 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.03.04 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.03.38 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.03.38 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.05.13 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.05.13 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.10.49 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.10.49 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.15.05 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.15.05 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.18.44 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.18.44 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.18.51 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.18.51 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.19.51 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.19.51 PM.png
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.19.58 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.19.58 PM.png
diff --git a/docs/images/Screen Shot 2019-01-13 at 10.32.32 AM.png b/docs/images/Screen Shot 2019-01-13 at 10.32.32 AM.png
diff --git a/docs/images/Screen Shot 2019-01-13 at 11.11.50 AM.png b/docs/images/Screen Shot 2019-01-13 at 11.11.50 AM.png
diff --git a/docs/images/Screen Shot 2019-01-13 at 11.21.19 AM.png b/docs/images/Screen Shot 2019-01-13 at 11.21.19 AM.png
diff --git a/docs/images/Screen Shot 2019-02-14 at 12.03.26 PM.png b/docs/images/Screen Shot 2019-02-14 at 12.03.26 PM.png
diff --git a/docs/images/Screen_Shot_2019-02-08_at_10.19.56_AM.png b/docs/images/Screen_Shot_2019-02-08_at_10.19.56_AM.png
diff --git a/docs/images/Screen_Shot_2019-02-15_at_2.53.37_PM.png b/docs/images/Screen_Shot_2019-02-15_at_2.53.37_PM.png
diff --git a/docs/images/Screen_Shot_2019-02-15_at_2.59.47_PM.png b/docs/images/Screen_Shot_2019-02-15_at_2.59.47_PM.png
diff --git a/docs/images/Screen_Shot_2019-02-15_at_3.06.49_PM.png b/docs/images/Screen_Shot_2019-02-15_at_3.06.49_PM.png
diff --git a/docs/images/WithCustomDropDown.png b/docs/images/WithCustomDropDown.png
diff --git a/docs/images/customResolution variable creation.png b/docs/images/customResolution variable creation.png
diff --git a/docs/images/customWIndowVariableCreation.png b/docs/images/customWIndowVariableCreation.png
diff --git a/docs/images/dgPolicy.png b/docs/images/dgPolicy.png
diff --git a/docs/images/templating.gif b/docs/images/templating.gif
diff --git a/docs/images/usrGp.png b/docs/images/usrGp.png
diff --git a/docs/images/usrPolicy.png b/docs/images/usrPolicy.png
diff --git a/docs/kubernetes.md b/docs/kubernetes.md
@@ -8,25 +8,30 @@
 
 ## Background
 
-Grafana is a popular technology that makes it easy to visualize metrics. The [Oracle Cloud Infrastructure Data Source for Grafana](https://grafana.com/plugins/oci-datasource) is used to extend Grafana by adding OCI as a data source. The plugin enables you to visualize metrics related to a number of OCI resources: Compute, Networking, Storage, and custom metrics.
+Grafana is a popular technology that makes it easy to visualize logs and metrics. The [Oracle Cloud Infrastructure Logs Data Source for Grafana](https://grafana.com/grafana/plugins/oci-logs-datasource/) is used to extend Grafana by adding OCI Logging as a data source. The plugin enables you to visualize log records (service, audit, and custom) and metrics derived from log records stored in the OCI Logging service.
 
-This walkthrough is intended for use by people who would like to deploy Grafana and the OCI Data Source for Grafana on a Kubernetes environment.
+This walkthrough is intended for use by people who would like to deploy Grafana and the OCI Logs Data Source for Grafana in a Kubernetes environment.
 
-Make sure you have access to the [Monitoring Service](https://docs.cloud.oracle.com/iaas/Content/Monitoring/Concepts/monitoringoverview.htm) and that [metrics have been enabled](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/enablingmonitoring.htm) for the resources you are trying to monitor.
+Make sure you have access to the [Logging Service](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/loggingoverview.htm) and that the logs you want to observe and analyze are being collected in your tenancy. See the OCI Logging documentation for information on how to collect or access:
+* [Logs from your compute instances](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/agent_management.htm)
+* [Custom logs from your application/services](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/custom_logs.htm)
+* [OCI service logs](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/service_logs.htm).
 
 ## Configuring the OCI Identity policies
 
-In order to use the the OCI Data Source for Grafana on OKE, the first step is to create a [dynamic group](https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingdynamicgroups.htm) used to group virtual machine or bare metal compute instances as “principals” (similar to user groups). Create a dynamic group that corresponds to all of your OKE worker nodes:
+In order to use the the OCI Logging Data Source for Grafana on OKE, the first step is to create a [dynamic group](https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingdynamicgroups.htm) used to group virtual machine or bare metal compute instances as “principals” (similar to user groups). Create a dynamic group that corresponds to all of your OKE worker nodes:
 
-   ![Screen Shot 2018-12-17 at 4.01.34 PM](images/Screen%20Shot%202018-12-17%20at%204.01.34%20PM.png)
+   ![OCIConsole-DynamicGroupList-Screenshot](images/OCIConsole-DynamicGroupList-Screenshot.png)
 
-Next, create a [policy](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policygetstarted.htm) named “grafana_policy” in the root compartment of your tenancy to permit instances in the dynamic group to make API calls against Oracle Cloud Infrastructure services. Add the following policy statements:
+Next, create a [policy](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policygetstarted.htm), for example named “grafana_policy”, in the root compartment of your tenancy to permit instances in the dynamic group to make API calls against Oracle Cloud Infrastructure services. Add the following policy statements:
 
-* `allow dynamicgroup grafana to read metrics in tenancy`
+* `allow dynamicgroup grafana to read read log-groups in tenancy`
+* `allow dynamicgroup grafana to read log-content in tenancy`
 * `allow dynamicgroup grafana to read compartments in tenancy`
 
-   ![Screen Shot 2018-12-17 at 4.01.47 PM](images/Screen%20Shot%202018-12-17%20at%204.01.47%20PM.png)
+   ![OCIConsole-PoliciesList-Screenshot](images/OCIConsole-PoliciesList-Screenshot.png)
 
+The first two policies can also be limited to specific compartments in your tenancy by adding additional qualifiers to the policy statements.
 
 ## The Grafana Helm chart
 
@@ -38,7 +43,7 @@ We can now make a change to the deployment that was created for Grafana by runni
 
 ```
         - name: GF_INSTALL_PLUGINS
-          value: oci-datasource
+          value: oci-logs-datasource
 ```
 
 ## Accessing Grafana
@@ -53,27 +58,31 @@ You can obtain the password for the admin user by running: `kubectl get secret -
 
 The next step is to configure the plugin. Navigate to the Grafana homepage at `http://localhost:3000`
 
-![Screen Shot 2018-12-17 at 3.23.46 PM](images/Screen%20Shot%202018-12-17%20at%203.23.46%20PM.png)
+![GrafanaLogin-Screenshot](images/GrafanaLogin-Screenshot.png)
 
 Log in with the default username `admin` and the password you obtained from the kubectl command from the previous section.
 
-On the Home Dashboard click the gear icon on the left side of the page.
+On the Home Dashboard click the gear icon on the left side of the page and then select **Data sources** from the Configuration menu.
 
-![Screen Shot 2018-12-17 at 3.24.02 PM](images/Screen%20Shot%202018-12-17%20at%203.24.02%20PM.png)
+![GrafanaHomePage-Screenshot](images/GrafanaHomePage-Screenshot.png)
 
 Click **Add data source**.
 
-![Screen Shot 2018-12-17 at 3.24.13 PM](images/Screen%20Shot%202018-12-17%20at%203.24.13%20PM.png)
+![Grafana-AddDataSource-Screenshot](images/Grafana-AddDataSource-Screenshot.png)
 
- Choose **oracle-oci-datasource** as your data source type.
+In the search box at the top of the resulting page, enter 'oracle'.
 
-![Screen Shot 2018-12-17 at 3.24.24 PM](images/Screen%20Shot%202018-12-17%20at%203.24.17%20PM.png)
+![Grafana-DataSourceSearch-Screenshot](images/Grafana-DataSourceSearch-Screenshot.png)
 
-Fill in your **Tenancy OCID**, **Default Region**, and **Environment**. Your **Default region** is the same as your home region listed in the **Tenancy Details** page. For **Environment** choose **OCI Instance**. 
+ Click the **Oracle Cloud Infrastructure Logs** box to select it as your data source type.
 
-Click **Save & Test** to return to the home dashboard.
+![Grafana-SelectOCILogsDataSource-Screenshot](images/Grafana-SelectOCILogsDataSource-Screenshot.png)
 
-![Screen Shot 2018-12-17 at 3.25.33 PM](images/Screen_Shot_2019-02-08_at_10.19.56_AM.png)
+On the Oracle Cloud Infrastructure Logs data source configuration page, fill in your **Tenancy OCID**, **Default Region**, and **Environment**. Your **Default region** is the same as your home region listed in the **Tenancy Details** page. For **Environment** choose **OCI Instance**. 
+
+Click **Save & Test** to test the configuration of the Logs data source. Click the Dashboard icon in the left hand navigation menu to return to the home dashboard.
+
+![Grafana-OCILogsPluginConfigWindow-Screenshot](images/Grafana-OCILogsPluginConfigWindow-Screenshot.png)
 
 ## Next Steps
 

diff --git a/docs/linux.md b/docs/linux.md
@@ -2,15 +2,18 @@
 
 ## Background
 
-Grafana is a popular technology that makes it easy to visualize metrics. The Oracle Cloud Infrastructure Data Source for Grafana is used to extend Grafana by adding OCI as a data source. The plugin enables you to visualize metrics related to a number of OCI resources: Compute, Networking, Storage, and custom metrics. 
+Grafana is a popular technology that makes it easy to visualize logs and metrics. The [Oracle Cloud Infrastructure Logs Data Source for Grafana](https://grafana.com/grafana/plugins/oci-logs-datasource/) is used to extend Grafana by adding OCI Logging as a data source. The plugin enables you to visualize log records (service, audit, and custom) and metrics derived from log records stored in the OCI Logging service.
 
-This walkthrough is intended for use by people who would like to deploy Grafana and the OCI Data Source for Grafana on a local server. 
+This walkthrough is intended for use by people who would like to deploy Grafana and the OCI Logs Data Source for Grafana on a local Linux server. 
 
-Make sure you have access to the [Monitoring Service](https://docs.cloud.oracle.com/iaas/Content/Monitoring/Concepts/monitoringoverview.htm) and that [metrics have been enabled](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/enablingmonitoring.htm) for the resources you are trying to monitor.  
+Make sure you have access to the [Logging Service](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/loggingoverview.htm) and that the logs you want to observe and analyze are being collected in your tenancy. See the OCI Logging documentation for information on how to collect or access:
+* [Logs from your compute instances](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/agent_management.htm)
+* [Custom logs from your application/services](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/custom_logs.htm)
+* [OCI service logs](https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/service_logs.htm).
 
 ## Install the Oracle Cloud Infrastructure CLI 
 
-The [Oracle Cloud Infrastructure CLI](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm) provides you with a way to perform tasks in OCI from your command line rather than the OCI Console. It does so by making REST calls to the [OCI APIs](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm). We will be using the CLI to authenticate between our local environment hosting Grafana and OCI in order to pull in metrics. The CLI is built on Python (version 2.7.5 or 3.5 or later), running on Mac, Windows, or Linux.
+The [Oracle Cloud Infrastructure CLI](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm) provides you with a way to perform tasks in OCI from your command line rather than the OCI Console. It does so by making REST calls to the [OCI APIs](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm). We will be using the CLI to authenticate between our local environment hosting Grafana and OCI in order to pull in logs. The CLI is built on Python (version 2.7.5 or 3.6 or later), running on Mac, Windows, or Linux.
 
 Begin by [installing the Oracle Cloud Infrastructure CLI](https://docs.cloud.oracle.com/iaas/Content/API/SDKDocs/cliinstall.htm). Follow the installation prompts to install the CLI on your local environment. After the installation is complete, use the `oci setup config` command to have the CLI walk you through the first-time setup process. If you haven't already uploaded your public API signing key through the console, follow the instructions [here](https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/apisigningkey.htm#How2) to do so. 
 
@@ -20,70 +23,75 @@ After the CLI has been configured, move the `~/.oci` folder to `/usr/share/grafa
 
 In the OCI console under **Identity > Groups** click **Create Group** and create a new group called **grafana**. Add the user configured in the OCI CLI to the newly-created group. 
 
-![Screen Shot 2018-12-19 at 3.02.31 PM](images/Screen%20Shot%202018-12-19%20at%203.02.31%20PM.png)
+![OCIConsole-GroupList-Screenshot](images/OCIConsole-GroupList-Screenshot.png)
 
-Under the **Policy** tab click **Create Policy** and create a policy allowing the group to read tenancy metrics. Add the following policy statements:
+Under the **Policy** tab click **Create Policy** and create policies allowing the group to read tenancy log objects and content. Add the following policy statements:
 
-- `allow group grafana to read metrics in tenancy`
+- `allow group grafana to read read log-groups in tenancy`
+- `allow group grafana to read log-content in tenancy`
 - `allow group grafana to read compartments in tenancy`
 
-![Screen Shot 2018-12-19 at 3.00.10 PM](images/Screen%20Shot%202018-12-19%20at%203.00.10%20PM.png)
+![OCIConsole-GroupLogsPolicyCreate-Screenshot](images/OCIConsole-GroupLogsPolicyCreate-Screenshot.png)
 
-## Install Grafana and the OCI Data Source for Grafana Plugin 
+The first two policies can also be limited to specific compartments in your tenancy by adding additional qualifiers to the policy statements.
 
-To [install the data source](https://grafana.com/plugins/oci-datasource/installation) make sure you are running [Grafana 3.0](https://grafana.com/get) or later. Use the [grafana-cli tool](http://docs.grafana.org/plugins/installation/) to install the Oracle Cloud Infrastructure Data Source for Grafana from the command line:
+## Install Grafana and the OCI Logs Data Source for Grafana Plugin 
+
+To [install the OCI Logs data source](https://grafana.com/plugins/oci-logs-datasource/installation) make sure you are running [Grafana 8.0](https://grafana.com/get) or later. Use the [grafana-cli tool](http://docs.grafana.org/plugins/installation/) to install the Oracle Cloud Infrastructure Logs Data Source for Grafana from the command line:
 
 ```
-grafana-cli plugins install oci-datasource
+grafana-cli plugins install oci-logs-datasource
 ```
 
-**NOTE** Today the latest version of the plugin is available only with the manual installation
-
 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-logs/releases/latest/download/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`. 
 
->  **Additional step for Grafana 7**. Open the grafana configuration  *grafana.ini* file and add the `allow_loading_unsigned_plugins = "oci-datasource"`in the *plugins* section.
+>  **Additional step for Grafana 8**. Open the grafana configuration  *grafana.ini* file and add the `allow_loading_unsigned_plugins = "oci-logs-datasource"`in the *plugins* section.
 
 *Example* 
 ```
     [plugins]
     ;enable_alpha = false
     ;app_tls_skip_verify_insecure = false
-    allow_loading_unsigned_plugins = "oci-datasource"
+    allow_loading_unsigned_plugins = "oci-logs-datasource"
 ```
 
 To start the Grafana server, run: `sudo systemctl start grafana-server`. 
 
-Navigate to the Grafana homepage at http://localhost:3000.
-
 
 ## Configure Grafana
 
-![Screen Shot 2018-12-17 at 3.23.46 PM](images/Screen%20Shot%202018-12-17%20at%203.23.46%20PM.png)
+The next step is to configure the plugin. Navigate to the Grafana homepage at `http://localhost:3000`
+
+![GrafanaLogin-Screenshot](images/GrafanaLogin-Screenshot.png)
 
 Log in with the default username `admin` and the password `admin`. You will be prompted to change your password. Click **Skip** or **Save** to continue. 
 
-![Screen Shot 2018-12-17 at 3.23.54 PM](images/Screen%20Shot%202018-12-17%20at%203.23.54%20PM.png)
+![Grafana-ChangeDefaultAdminPassword-Screenshot](images/Grafana-ChangeDefaultAdminPassword-Screenshot.png)
 
-On the Home Dashboard click the gear icon on the left side of the page.
+On the Home Dashboard click the gear icon on the left side of the page and then select **Data sources** from the Configuration menu.
 
-![Screen Shot 2018-12-17 at 3.24.02 PM](images/Screen%20Shot%202018-12-17%20at%203.24.02%20PM.png)
+![GrafanaHomePage-Screenshot](images/GrafanaHomePage-Screenshot.png)
 
 Click **Add data source**.
 
-![Screen Shot 2018-12-17 at 3.24.13 PM](images/Screen%20Shot%202018-12-17%20at%203.24.13%20PM.png)
+![Grafana-AddDataSource-Screenshot](images/Grafana-AddDataSource-Screenshot.png)
+
+In the search box at the top of the resulting page, enter 'oracle'.
+
+![Grafana-DataSourceSearch-Screenshot](images/Grafana-DataSourceSearch-Screenshot.png)
 
- Choose **oracle-oci-datasource** as your data source type.
+ Click the **Oracle Cloud Infrastructure Logs** box to select it as your data source type.
 
-![Screen Shot 2018-12-17 at 3.24.24 PM](images/Screen%20Shot%202018-12-17%20at%203.24.17%20PM.png)
+![Grafana-SelectOCILogsDataSource-Screenshot](images/Grafana-SelectOCILogsDataSource-Screenshot.png)
 
-Fill in your **Tenancy OCID**, **Default Region**, and **Environment**. For **Environment** choose **local**. 
+On the Oracle Cloud Infrastructure Logs data source configuration page, fill in your **Tenancy OCID**, **Default Region**, and **Environment**. Your **Default region** is the same as your home region listed in the **Tenancy Details** page. For **Environment** choose **OCI Instance**. 
 
-Click **Save & Test** to return to the home dashboard.
+Click **Save & Test** to test the configuration of the Logs data source. Click the Dashboard icon in the left hand navigation menu to return to the home dashboard.
 
-![Screen Shot 2018-12-17 at 3.25.33 PM](images/Screen%20Shot%202018-12-17%20at%203.25.33%20PM.png)
+![Grafana-OCILogsPluginConfigWindow-Screenshot](images/Grafana-OCILogsPluginConfigWindow-Screenshot.png)
 
 ## Next Steps