diff --git a/java-monitoring-dashboards/.gitignore b/java-monitoring-dashboards/.gitignore
new file mode 100644
index 000000000000..069d08fc73e8
--- /dev/null
+++ b/java-monitoring-dashboards/.gitignore
@@ -0,0 +1,17 @@
+# Maven
+target/
+
+# Eclipse
+.classpath
+.project
+.settings
+
+# Intellij
+*.iml
+.idea/
+
+# python utilities
+*.pyc
+__pycache__
+
+.flattened-pom.xml
diff --git a/java-monitoring-dashboards/README.md b/java-monitoring-dashboards/README.md
index 3a26e9efba3c..985f149403bf 100644
--- a/java-monitoring-dashboards/README.md
+++ b/java-monitoring-dashboards/README.md
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
- * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return A list containing the shownColumns.
*/
+ @java.lang.Deprecated
public com.google.protobuf.ProtocolStringList getShownColumnsList() {
return shownColumns_;
}
@@ -88,14 +93,19 @@ public com.google.protobuf.ProtocolStringList getShownColumnsList() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return The count of shownColumns.
*/
+ @java.lang.Deprecated
public int getShownColumnsCount() {
return shownColumns_.size();
}
@@ -103,15 +113,20 @@ public int getShownColumnsCount() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the element to return.
* @return The shownColumns at the given index.
*/
+ @java.lang.Deprecated
public java.lang.String getShownColumns(int index) {
return shownColumns_.get(index);
}
@@ -119,15 +134,20 @@ public java.lang.String getShownColumns(int index) {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the value to return.
* @return The bytes of the shownColumns at the given index.
*/
+ @java.lang.Deprecated
public com.google.protobuf.ByteString getShownColumnsBytes(int index) {
return shownColumns_.getByteString(index);
}
@@ -497,14 +517,19 @@ private void ensureShownColumnsIsMutable() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return A list containing the shownColumns.
*/
+ @java.lang.Deprecated
public com.google.protobuf.ProtocolStringList getShownColumnsList() {
return shownColumns_.getUnmodifiableView();
}
@@ -512,14 +537,19 @@ public com.google.protobuf.ProtocolStringList getShownColumnsList() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return The count of shownColumns.
*/
+ @java.lang.Deprecated
public int getShownColumnsCount() {
return shownColumns_.size();
}
@@ -527,15 +557,20 @@ public int getShownColumnsCount() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the element to return.
* @return The shownColumns at the given index.
*/
+ @java.lang.Deprecated
public java.lang.String getShownColumns(int index) {
return shownColumns_.get(index);
}
@@ -543,15 +578,20 @@ public java.lang.String getShownColumns(int index) {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the value to return.
* @return The bytes of the shownColumns at the given index.
*/
+ @java.lang.Deprecated
public com.google.protobuf.ByteString getShownColumnsBytes(int index) {
return shownColumns_.getByteString(index);
}
@@ -559,16 +599,21 @@ public com.google.protobuf.ByteString getShownColumnsBytes(int index) {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index to set the value at.
* @param value The shownColumns to set.
* @return This builder for chaining.
*/
+ @java.lang.Deprecated
public Builder setShownColumns(int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -582,15 +627,20 @@ public Builder setShownColumns(int index, java.lang.String value) {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param value The shownColumns to add.
* @return This builder for chaining.
*/
+ @java.lang.Deprecated
public Builder addShownColumns(java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -604,15 +654,20 @@ public Builder addShownColumns(java.lang.String value) {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param values The shownColumns to add.
* @return This builder for chaining.
*/
+ @java.lang.Deprecated
public Builder addAllShownColumns(java.lang.Iterable- * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return This builder for chaining.
*/
+ @java.lang.Deprecated
public Builder clearShownColumns() {
shownColumns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000001);
@@ -641,15 +701,20 @@ public Builder clearShownColumns() {
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated.
+ * See google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param value The bytes of the shownColumns to add.
* @return This builder for chaining.
*/
+ @java.lang.Deprecated
public Builder addShownColumnsBytes(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsOrBuilder.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsOrBuilder.java
index abd96bb4cb17..37701013cb40 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsOrBuilder.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsOrBuilder.java
@@ -27,54 +27,74 @@ public interface TableDisplayOptionsOrBuilder
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return A list containing the shownColumns.
*/
+ @java.lang.Deprecated
java.util.List- * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @return The count of shownColumns.
*/
+ @java.lang.Deprecated
int getShownColumnsCount();
/**
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the element to return.
* @return The shownColumns at the given index.
*/
+ @java.lang.Deprecated
java.lang.String getShownColumns(int index);
/**
*
*
* - * Optional. Columns to display in the table. Leave empty to display all available - * columns. Note: This field is for future features and is not currently used. + * Optional. This field is unused and has been replaced by + * TimeSeriesTable.column_settings ** - *
repeated string shown_columns = 1 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * repeated string shown_columns = 1 [deprecated = true, (.google.api.field_behavior) = OPTIONAL];
+ *
*
+ * @deprecated google.monitoring.dashboard.v1.TableDisplayOptions.shown_columns is deprecated. See
+ * google/monitoring/dashboard/v1/table_display_options.proto;l=32
* @param index The index of the value to return.
* @return The bytes of the shownColumns at the given index.
*/
+ @java.lang.Deprecated
com.google.protobuf.ByteString getShownColumnsBytes(int index);
}
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsProto.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsProto.java
index baf10b627a26..c4436d1ea86c 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsProto.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TableDisplayOptionsProto.java
@@ -43,15 +43,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"\n:google/monitoring/dashboard/v1/table_d"
+ "isplay_options.proto\022\036google.monitoring."
+ "dashboard.v1\032\037google/api/field_behavior."
- + "proto\"1\n\023TableDisplayOptions\022\032\n\rshown_co"
- + "lumns\030\001 \003(\tB\003\340A\001B\202\002\n\"com.google.monitori"
- + "ng.dashboard.v1B\030TableDisplayOptionsProt"
- + "oP\001ZGgoogle.golang.org/genproto/googleap"
- + "is/monitoring/dashboard/v1;dashboard\252\002$G"
- + "oogle.Cloud.Monitoring.Dashboard.V1\312\002$Go"
- + "ogle\\Cloud\\Monitoring\\Dashboard\\V1\352\002(Goo"
- + "gle::Cloud::Monitoring::Dashboard::V1b\006p"
- + "roto3"
+ + "proto\"3\n\023TableDisplayOptions\022\034\n\rshown_co"
+ + "lumns\030\001 \003(\tB\005\030\001\340A\001B\202\002\n\"com.google.monito"
+ + "ring.dashboard.v1B\030TableDisplayOptionsPr"
+ + "otoP\001ZGgoogle.golang.org/genproto/google"
+ + "apis/monitoring/dashboard/v1;dashboard\252\002"
+ + "$Google.Cloud.Monitoring.Dashboard.V1\312\002$"
+ + "Google\\Cloud\\Monitoring\\Dashboard\\V1\352\002(G"
+ + "oogle::Cloud::Monitoring::Dashboard::V1b"
+ + "\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilter.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilter.java
index 26c4f7085317..cff7b6d55594 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilter.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilter.java
@@ -338,7 +338,7 @@ public com.google.monitoring.dashboard.v1.PickTimeSeriesFilter getPickTimeSeries
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Override
@@ -359,7 +359,7 @@ public boolean hasStatisticalTimeSeriesFilter() {
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Override
@@ -1650,7 +1650,7 @@ public Builder clearPickTimeSeriesFilter() {
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Override
@@ -1671,7 +1671,7 @@ public boolean hasStatisticalTimeSeriesFilter() {
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Override
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterOrBuilder.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterOrBuilder.java
index d454221964c4..c19cca28275d 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterOrBuilder.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterOrBuilder.java
@@ -175,7 +175,7 @@ public interface TimeSeriesFilterOrBuilder
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Deprecated
@@ -193,7 +193,7 @@ public interface TimeSeriesFilterOrBuilder
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilter.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=76
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=79
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Deprecated
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatio.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatio.java
index 50881763d903..870b70e46adc 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatio.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatio.java
@@ -1324,7 +1324,7 @@ public com.google.monitoring.dashboard.v1.PickTimeSeriesFilter getPickTimeSeries
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter
- * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Override
@@ -1345,7 +1345,7 @@ public boolean hasStatisticalTimeSeriesFilter() {
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter
- * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Override
@@ -2722,7 +2722,7 @@ public Builder clearPickTimeSeriesFilter() {
*
* @deprecated
* google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Override
@@ -2744,7 +2744,7 @@ public boolean hasStatisticalTimeSeriesFilter() {
*
* @deprecated
* google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter is
- * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Override
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatioOrBuilder.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatioOrBuilder.java
index 6701a5dc1553..84ad1f17c5b0 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatioOrBuilder.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesFilterRatioOrBuilder.java
@@ -179,7 +179,7 @@ public interface TimeSeriesFilterRatioOrBuilder
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter
- * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return Whether the statisticalTimeSeriesFilter field is set.
*/
@java.lang.Deprecated
@@ -197,7 +197,7 @@ public interface TimeSeriesFilterRatioOrBuilder
*
*
* @deprecated google.monitoring.dashboard.v1.TimeSeriesFilterRatio.statistical_time_series_filter
- * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=115
+ * is deprecated. See google/monitoring/dashboard/v1/metrics.proto;l=118
* @return The statisticalTimeSeriesFilter.
*/
@java.lang.Deprecated
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQuery.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQuery.java
index c0072cd1d2e9..cc8e7fe4e639 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQuery.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQuery.java
@@ -78,6 +78,7 @@ public enum SourceCase
TIME_SERIES_FILTER(1),
TIME_SERIES_FILTER_RATIO(2),
TIME_SERIES_QUERY_LANGUAGE(3),
+ PROMETHEUS_QUERY(6),
SOURCE_NOT_SET(0);
private final int value;
@@ -102,6 +103,8 @@ public static SourceCase forNumber(int value) {
return TIME_SERIES_FILTER_RATIO;
case 3:
return TIME_SERIES_QUERY_LANGUAGE;
+ case 6:
+ return PROMETHEUS_QUERY;
case 0:
return SOURCE_NOT_SET;
default:
@@ -230,7 +233,7 @@ public com.google.monitoring.dashboard.v1.TimeSeriesFilterRatio getTimeSeriesFil
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -244,7 +247,7 @@ public boolean hasTimeSeriesQueryLanguage() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -271,7 +274,7 @@ public java.lang.String getTimeSeriesQueryLanguage() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -295,6 +298,76 @@ public com.google.protobuf.ByteString getTimeSeriesQueryLanguageBytes() {
}
}
+ public static final int PROMETHEUS_QUERY_FIELD_NUMBER = 6;
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return Whether the prometheusQuery field is set.
+ */
+ public boolean hasPrometheusQuery() {
+ return sourceCase_ == 6;
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The prometheusQuery.
+ */
+ public java.lang.String getPrometheusQuery() {
+ java.lang.Object ref = "";
+ if (sourceCase_ == 6) {
+ ref = source_;
+ }
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (sourceCase_ == 6) {
+ source_ = s;
+ }
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The bytes for prometheusQuery.
+ */
+ public com.google.protobuf.ByteString getPrometheusQueryBytes() {
+ java.lang.Object ref = "";
+ if (sourceCase_ == 6) {
+ ref = source_;
+ }
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ if (sourceCase_ == 6) {
+ source_ = b;
+ }
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int UNIT_OVERRIDE_FIELD_NUMBER = 5;
private volatile java.lang.Object unitOverride_;
/**
@@ -378,6 +451,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(unitOverride_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 5, unitOverride_);
}
+ if (sourceCase_ == 6) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, source_);
+ }
getUnknownFields().writeTo(output);
}
@@ -403,6 +479,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(unitOverride_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, unitOverride_);
}
+ if (sourceCase_ == 6) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, source_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -431,6 +510,9 @@ public boolean equals(final java.lang.Object obj) {
case 3:
if (!getTimeSeriesQueryLanguage().equals(other.getTimeSeriesQueryLanguage())) return false;
break;
+ case 6:
+ if (!getPrometheusQuery().equals(other.getPrometheusQuery())) return false;
+ break;
case 0:
default:
}
@@ -460,6 +542,10 @@ public int hashCode() {
hash = (37 * hash) + TIME_SERIES_QUERY_LANGUAGE_FIELD_NUMBER;
hash = (53 * hash) + getTimeSeriesQueryLanguage().hashCode();
break;
+ case 6:
+ hash = (37 * hash) + PROMETHEUS_QUERY_FIELD_NUMBER;
+ hash = (53 * hash) + getPrometheusQuery().hashCode();
+ break;
case 0:
default:
}
@@ -656,6 +742,9 @@ public com.google.monitoring.dashboard.v1.TimeSeriesQuery buildPartial() {
if (sourceCase_ == 3) {
result.source_ = source_;
}
+ if (sourceCase_ == 6) {
+ result.source_ = source_;
+ }
result.unitOverride_ = unitOverride_;
result.sourceCase_ = sourceCase_;
onBuilt();
@@ -730,6 +819,13 @@ public Builder mergeFrom(com.google.monitoring.dashboard.v1.TimeSeriesQuery othe
onChanged();
break;
}
+ case PROMETHEUS_QUERY:
+ {
+ sourceCase_ = 6;
+ source_ = other.source_;
+ onChanged();
+ break;
+ }
case SOURCE_NOT_SET:
{
break;
@@ -788,6 +884,13 @@ public Builder mergeFrom(
break;
} // case 42
+ case 50:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+ sourceCase_ = 6;
+ source_ = s;
+ break;
+ } // case 50
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1261,7 +1364,7 @@ public Builder clearTimeSeriesFilterRatio() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1276,7 +1379,7 @@ public boolean hasTimeSeriesQueryLanguage() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1304,7 +1407,7 @@ public java.lang.String getTimeSeriesQueryLanguage() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1332,7 +1435,7 @@ public com.google.protobuf.ByteString getTimeSeriesQueryLanguageBytes() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1353,7 +1456,7 @@ public Builder setTimeSeriesQueryLanguage(java.lang.String value) {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1372,7 +1475,7 @@ public Builder clearTimeSeriesQueryLanguage() {
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -1391,6 +1494,140 @@ public Builder setTimeSeriesQueryLanguageBytes(com.google.protobuf.ByteString va
return this;
}
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return Whether the prometheusQuery field is set.
+ */
+ @java.lang.Override
+ public boolean hasPrometheusQuery() {
+ return sourceCase_ == 6;
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The prometheusQuery.
+ */
+ @java.lang.Override
+ public java.lang.String getPrometheusQuery() {
+ java.lang.Object ref = "";
+ if (sourceCase_ == 6) {
+ ref = source_;
+ }
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (sourceCase_ == 6) {
+ source_ = s;
+ }
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The bytes for prometheusQuery.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getPrometheusQueryBytes() {
+ java.lang.Object ref = "";
+ if (sourceCase_ == 6) {
+ ref = source_;
+ }
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ if (sourceCase_ == 6) {
+ source_ = b;
+ }
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @param value The prometheusQuery to set.
+ * @return This builder for chaining.
+ */
+ public Builder setPrometheusQuery(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ sourceCase_ = 6;
+ source_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearPrometheusQuery() {
+ if (sourceCase_ == 6) {
+ sourceCase_ = 0;
+ source_ = null;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @param value The bytes for prometheusQuery to set.
+ * @return This builder for chaining.
+ */
+ public Builder setPrometheusQueryBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ sourceCase_ = 6;
+ source_ = value;
+ onChanged();
+ return this;
+ }
+
private java.lang.Object unitOverride_ = "";
/**
*
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQueryOrBuilder.java b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQueryOrBuilder.java
index 2a0993e55d0f..dbe191b9cee8 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQueryOrBuilder.java
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/TimeSeriesQueryOrBuilder.java
@@ -101,7 +101,7 @@ public interface TimeSeriesQueryOrBuilder
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -113,7 +113,7 @@ public interface TimeSeriesQueryOrBuilder
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -125,7 +125,7 @@ public interface TimeSeriesQueryOrBuilder
*
*
* - * A query used to fetch time series. + * A query used to fetch time series with MQL. ** *
string time_series_query_language = 3;
@@ -134,6 +134,43 @@ public interface TimeSeriesQueryOrBuilder
*/
com.google.protobuf.ByteString getTimeSeriesQueryLanguageBytes();
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return Whether the prometheusQuery field is set.
+ */
+ boolean hasPrometheusQuery();
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The prometheusQuery.
+ */
+ java.lang.String getPrometheusQuery();
+ /**
+ *
+ *
+ * + * A query used to fetch time series with PromQL. + *+ * + *
string prometheus_query = 6;
+ *
+ * @return The bytes for prometheusQuery.
+ */
+ com.google.protobuf.ByteString getPrometheusQueryBytes();
+
/**
*
*
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/metrics.proto b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/metrics.proto
index c5ae8f718c26..b28dbdcf95ce 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/metrics.proto
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/metrics.proto
@@ -38,8 +38,11 @@ message TimeSeriesQuery {
// Parameters to fetch a ratio between two time series filters.
TimeSeriesFilterRatio time_series_filter_ratio = 2;
- // A query used to fetch time series.
+ // A query used to fetch time series with MQL.
string time_series_query_language = 3;
+
+ // A query used to fetch time series with PromQL.
+ string prometheus_query = 6;
}
// The unit of data contained in fetched time series. If non-empty, this
diff --git a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/table_display_options.proto b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/table_display_options.proto
index b94b20b11bc5..468005f2f23b 100644
--- a/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/table_display_options.proto
+++ b/java-monitoring-dashboards/proto-google-cloud-monitoring-dashboard-v1/src/main/proto/google/monitoring/dashboard/v1/table_display_options.proto
@@ -28,7 +28,10 @@ option ruby_package = "Google::Cloud::Monitoring::Dashboard::V1";
// Table display options that can be reused.
message TableDisplayOptions {
- // Optional. Columns to display in the table. Leave empty to display all available
- // columns. Note: This field is for future features and is not currently used.
- repeated string shown_columns = 1 [(google.api.field_behavior) = OPTIONAL];
+ // Optional. This field is unused and has been replaced by
+ // TimeSeriesTable.column_settings
+ repeated string shown_columns = 1 [
+ deprecated = true,
+ (google.api.field_behavior) = OPTIONAL
+ ];
}