Skip to content

Commit 2297ec8

Browse files
authored
Merge pull request #7 from oracle-quickstart/ebs-v1
Add deploy button
2 parents 5299b9d + 475604a commit 2297ec8

File tree

2 files changed

+18
-49
lines changed

2 files changed

+18
-49
lines changed

README.md

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,27 @@
11
# oci-o11y-solutions
22
Oracle Observability and Management Solution Templates
33

4-
This is an example on how to deploy dashboards in Logging Analytics.
5-
## Deploy Using the Terraform CLI
6-
4+
This is an example on how to export, add & deploy dashboards in Logging Analytics.
5+
## Sharing new Logging Analytics Dashboards
6+
### Export Dashboard json
7+
export DASHBOARD_ID=”<OCID….>”
8+
oci raw-request --http-method GET --target-uri https://managementdashboard.us-phoenix-1.oci.oraclecloud.com/20200901/managementDashboards/${DASHBOARD_ID} | jq .data | jq '.compartmentId = "${compartment_ocid}"' | jq -n -s '{dashboards: inputs}'
9+
710
### Clone the Module
811
Now, you'll want a local copy of this repo. You can make that with the commands:
912

1013
git clone https://github.com/oracle-quickstart/oci-o11y-solutions.git
1114
cd oci-o11y-solutions
12-
ls
13-
14-
### Prerequisites
15-
First off, you'll need to do some pre-deploy setup for Docker and Fn Project inside your machine:
16-
17-
```
18-
sudo su -
19-
yum update
20-
yum install yum-utils
21-
yum-config-manager --enable *addons
22-
yum install docker-engine
23-
groupadd docker
24-
service docker restart
25-
usermod -a -G docker opc
26-
chmod 666 /var/run/docker.sock
27-
exit
28-
curl -LSs https://raw.githubusercontent.com/fnproject/cli/master/install | sh
29-
exit
30-
```
31-
32-
### Set Up and Configure Terraform
33-
34-
1. Complete the prerequisites described [here](https://github.com/cloud-partners/oci-prerequisites).
35-
36-
2. Create a `terraform.tfvars` file, and specify the following variables:
37-
38-
```
39-
# Authentication
40-
tenancy_ocid="<tenancy_ocid>"
41-
auth_type="user"
42-
# Config file is ~/.oci/config
43-
config_file_profile="DEFAULT"
44-
45-
# Region
46-
region = "<oci_region>"
47-
48-
# Compartment
49-
compartment_ocid = "<compartment_ocid>"
50-
51-
### Create the Resources
52-
Run the following commands:
15+
git branch -b my-branch main
5316

54-
terraform init
55-
terraform plan
56-
terraform apply
17+
### Add dashboard files
18+
cp my-dashboard.json contents/dashboards
19+
cp my-dashboard.png contents/documentation
5720

21+
### Commit and push changes
22+
git add contents/dashboards/my-dashboard.json
23+
git add contents/documentation/my-dashboard.png
24+
git commit -a -m "Adding Dashboard files"
25+
git push origin my-branch
5826

27+
### Create Pull Request

providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ provider "oci" {
55
# alias = "current"
66
tenancy_ocid = var.tenancy_ocid
77
# comment for stack zip file
8-
config_file_profile = var.config_file_profile
8+
# config_file_profile = var.config_file_profile
99
region = var.region
1010
}
1111

1212
provider "oci" {
1313
alias = "home"
1414
tenancy_ocid = var.tenancy_ocid
1515
# comment for stack zip file
16-
config_file_profile = var.config_file_profile
16+
# config_file_profile = var.config_file_profile
1717
region = data.oci_identity_region_subscriptions.home_region_subscriptions.region_subscriptions[0].region_name
1818
disable_auto_retries = "true"
1919
}

0 commit comments

Comments
 (0)