From eff5d4f998628c8cc2f04e8a815a5c8ddbb66d57 Mon Sep 17 00:00:00 2001 From: Andrea Hoffer Date: Mon, 7 Oct 2019 10:35:25 -0400 Subject: [PATCH] Fixing build errors and warnings --- ...ing-configure-aws-billing-correlation.adoc | 24 +++++++++---------- service_mesh/servicemesh-release-notes.adoc | 4 +--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/metering/configuring-metering/metering-configure-aws-billing-correlation.adoc b/metering/configuring-metering/metering-configure-aws-billing-correlation.adoc index adcbc60e7a..32931b957e 100644 --- a/metering/configuring-metering/metering-configure-aws-billing-correlation.adoc +++ b/metering/configuring-metering/metering-configure-aws-billing-correlation.adoc @@ -20,27 +20,27 @@ spec: enabled: true # Replace these with where your AWS billing reports are # stored in S3. - bucket: "your-aws-cost-report-bucket" <1> - prefix: "path/to/report" - region: "your-buckets-region" + bucket: "" <1> + prefix: "" + region: "" reporting-operator: spec: config: aws: - secretName: "your-aws-secret" + secretName: "" <2> presto: spec: config: aws: - secretName: "your-aws-secret" + secretName: "" <2> hive: spec: config: aws: - secretName: "your-aws-secret" + secretName: "" <2> ---- To enable AWS billing correlation, first ensure the AWS Cost and Usage Reports are enabled. For more information, see https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/billing-reports-gettingstarted-turnonreports.html[Turning on the AWS Cost and Usage Report] in the AWS documentation. @@ -52,13 +52,13 @@ To enable AWS billing correlation, first ensure the AWS Cost and Usage Reports a apiVersion: v1 kind: Secret metadata: - name: your-aws-secret + name: data: aws-access-key-id: "dGVzdAo=" aws-secret-access-key: "c2VjcmV0Cg==" ---- -To store data in S3, the `aws-access-key-id` and `aws-secret-access-key` credentials must have read and write access to the bucket. For an example of an IAM policy granting the required permissions, see the `aws/read-write.json` file below. +To store data in S3, the `aws-access-key-id` and `aws-secret-access-key` credentials must have read and write access to the bucket. For an example of an IAM policy granting the required permissions, see the `aws/read-write.json` file below. [source,json] ---- @@ -78,8 +78,8 @@ To store data in S3, the `aws-access-key-id` and `aws-secret-access-key` credent "s3:PutObject" ], "Resource": [ - "arn:aws:s3:::operator-metering-data/*", - "arn:aws:s3:::operator-metering-data" + "arn:aws:s3:::operator-metering-data/*", <1> + "arn:aws:s3:::operator-metering-data" <1> ] } ] @@ -100,8 +100,8 @@ To store data in S3, the `aws-access-key-id` and `aws-secret-access-key` credent "s3:PutObject" ], "Resource": [ - "arn:aws:s3:::operator-metering-data/*", - "arn:aws:s3:::operator-metering-data" + "arn:aws:s3:::operator-metering-data/*", <1> + "arn:aws:s3:::operator-metering-data" <1> ] } ] diff --git a/service_mesh/servicemesh-release-notes.adoc b/service_mesh/servicemesh-release-notes.adoc index 3073758729..81ff5245ac 100644 --- a/service_mesh/servicemesh-release-notes.adoc +++ b/service_mesh/servicemesh-release-notes.adoc @@ -5,8 +5,6 @@ include::modules/ossm-document-attributes.adoc[] toc::[] -= {RN_BookName} - // The following include statements pull in the module files that comprise the assembly. include::modules/ossm-servicemesh-overview.adoc[leveloffset=+1] @@ -19,4 +17,4 @@ include::modules/ossm-rn-new-features.adoc[leveloffset=+1] include::modules/ossm-rn-known-issues.adoc[leveloffset=+1] -include::modules/ossm-rn-fixed-issues.adoc[leveloffset=+1] \ No newline at end of file +include::modules/ossm-rn-fixed-issues.adoc[leveloffset=+1]