Skip to content

Commit b7f0208

Browse files
Merge pull request #31776 from lbarbeevargas/add-deprecated-feature-module
New deprecated-feature module and added to Metering assemblies
2 parents d316b20 + 6b21f7e commit b7f0208

16 files changed

+56
-0
lines changed

metering/configuring_metering/metering-about-configuring.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
The `MeteringConfig` custom resource specifies all the configuration details for your metering installation. When you first install the metering stack, a default `MeteringConfig` custom resource is generated. Use the examples in the documentation to modify this default file. Keep in mind the following key points:
912

1013
* At a minimum, you need to xref:../../metering/configuring_metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[configure persistent storage] and xref:../../metering/configuring_metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[configure the Hive metastore].

metering/configuring_metering/metering-common-config-options.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
== Resource requests and limits
912
You can adjust the CPU, memory, or storage resource requests and/or limits for pods and volumes. The `default-resource-limits.yaml` below provides an example of setting resource request and limits for each component.
1013

metering/configuring_metering/metering-configure-aws-billing-correlation.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Metering can correlate cluster usage information with https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/billing-reports-costusage.html[AWS detailed billing information], attaching a dollar amount to resource usage. For clusters running in EC2, you can enable this by modifying the example `aws-billing.yaml` file below.
912

1013
[source,yaml]

metering/configuring_metering/metering-configure-hive-metastore.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Hive metastore is responsible for storing all the metadata about the database tables created in Presto and Hive. By default, the metastore stores this information in a local embedded Derby database in a persistent volume attached to the pod.
912

1013
Generally, the default configuration of the Hive metastore works for small clusters, but users may wish to improve performance or move storage requirements out of cluster by using a dedicated SQL database for storing the Hive metastore data.

metering/configuring_metering/metering-configure-persistent-storage.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Metering requires persistent storage to persist data collected by the Metering Operator and to store the results of reports. A number of different storage providers and storage formats are supported. Select your storage provider and modify the example configuration files to configure persistent storage for your metering installation.
912

1013
include::modules/metering-store-data-in-s3.adoc[leveloffset=+1]

metering/configuring_metering/metering-configure-reporting-operator.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
The Reporting Operator is responsible for collecting data from Prometheus, storing the metrics in Presto, running report queries against Presto, and exposing their results via an HTTP API. Configuring the Reporting Operator is primarily done in your `MeteringConfig` custom resource.
912

1013
include::modules/metering-prometheus-connection.adoc[leveloffset=+1]

metering/metering-about-metering.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
include::modules/metering-overview.adoc[leveloffset=+1]

metering/metering-installing-metering.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Review the following sections before installing metering into your cluster.
912

1013
To get started installing metering, first install the Metering Operator from OperatorHub. Next, configure your instance of metering by creating a `MeteringConfig` custom resource (CR). Installing the Metering Operator creates a default `MeteringConfig` resource that you can modify using the examples in the documentation. After creating your `MeteringConfig` resource, install the metering stack. Last, verify your installation.

metering/metering-troubleshooting-debugging.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Use the following sections to help troubleshoot and debug specific issues with metering.
912

1013
In addition to the information in this section, be sure to review the following topics:

metering/metering-uninstall.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
You can remove metering from your {product-title} cluster.
912

1013
[NOTE]

metering/metering-upgrading-metering.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
You can upgrade metering to {product-version} by updating the Metering Operator subscription.
912

1013
== Prerequisites

metering/metering-usage-examples.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
Use the following example reports to get started measuring capacity, usage, and utilization in your cluster. These examples showcase the various types of reports metering offers, along with a selection of the predefined queries.
912

1013
== Prerequisites

metering/metering-using-metering.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
== Prerequisites
912

1013
* xref:../metering/metering-installing-metering.adoc#metering-install-operator_installing-metering[Install Metering]

metering/reports/metering-about-reports.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
A `Report` custom resource provides a method to manage periodic Extract Transform and Load (ETL) jobs using SQL queries. Reports are composed from other metering resources, such as `ReportQuery` resources that provide the actual SQL query to run, and `ReportDataSource` resources that define the data available to the `ReportQuery` and `Report` resources.
912

1013
Many use cases are addressed by the predefined `ReportQuery` and `ReportDataSource` resources that come installed with metering. Therefore, you do not need to define your own unless you have a use case that is not covered by these predefined resources.

metering/reports/metering-storage-locations.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8+
:FeatureName: Metering
9+
include::modules/deprecated-feature.adoc[leveloffset=+1]
10+
811
A `StorageLocation` custom resource configures where data will be stored by the Reporting Operator. This includes the data collected from Prometheus, and the results produced by generating a `Report` custom resource.
912

1013
You only need to configure a `StorageLocation` custom resource if you want to store data in multiple locations, like multiple S3 buckets or both S3 and HDFS, or if you wish to access a database in Hive and Presto that was not created by metering. For most users this is not a requirement, and the xref:../../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[documentation on configuring metering] is sufficient to configure all necessary storage components.

modules/deprecated-feature.adoc

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// When including this file, ensure that {FeatureName} is set immediately before
2+
// the include. Otherwise it will result in an incorrect replacement.
3+
4+
[IMPORTANT]
5+
====
6+
{FeatureName} is a deprecated feature. Deprecated functionality is still included in {product-title} and continues to be supported; however, it will be removed in a future release of this product and is not recommended for new deployments.
7+
8+
For the most recent list of major functionality that has been deprecated or removed within {product-title}, refer to the _Deprecated and removed features_ section of the {product-title} release notes.
9+
====
10+
// Undefine {FeatureName} attribute, so that any mistakes are easily spotted
11+
:!FeatureName:

0 commit comments

Comments
 (0)