Skip to content

Commit 177dc74

Browse files
committed
removed remaining mentions of export metrics and fixed clippy issues
Signed-off-by: Kumar Ujjawal <[email protected]>
1 parent a858890 commit 177dc74

File tree

5 files changed

+0
-672
lines changed

5 files changed

+0
-672
lines changed

config/config.md

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,6 @@
200200
| `slow_query.record_type` | String | Unset | The record type of slow queries. It can be `system_table` or `log`. |
201201
| `slow_query.threshold` | String | Unset | The threshold of slow query. |
202202
| `slow_query.sample_ratio` | Float | Unset | The sampling ratio of slow query log. The value should be in the range of (0, 1]. |
203-
| `export_metrics` | -- | -- | The standalone can export its metrics and send to Prometheus compatible service (e.g. `greptimedb`) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
204-
| `export_metrics.enable` | Bool | `false` | whether enable export metrics. |
205-
| `export_metrics.write_interval` | String | `30s` | The interval of export metrics. |
206-
| `export_metrics.self_import` | -- | -- | For `standalone` mode, `self_import` is recommended to collect metrics generated by itself<br/>You must create the database before enabling it. |
207-
| `export_metrics.self_import.db` | String | Unset | -- |
208-
| `export_metrics.remote_write` | -- | -- | -- |
209-
| `export_metrics.remote_write.url` | String | `""` | The prometheus remote write endpoint that the metrics send to. The url example can be: `http://127.0.0.1:4000/v1/prometheus/write?db=greptime_metrics`. |
210-
| `export_metrics.remote_write.headers` | InlineTable | -- | HTTP headers of Prometheus remote-write carry. |
211203
| `tracing` | -- | -- | The tracing options. Only effect when compiled with `tokio-console` feature. |
212204
| `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
213205
| `memory` | -- | -- | The memory options. |
@@ -320,12 +312,6 @@
320312
| `slow_query.threshold` | String | `30s` | The threshold of slow query. It can be human readable time string, for example: `10s`, `100ms`, `1s`. |
321313
| `slow_query.sample_ratio` | Float | `1.0` | The sampling ratio of slow query log. The value should be in the range of (0, 1]. For example, `0.1` means 10% of the slow queries will be logged and `1.0` means all slow queries will be logged. |
322314
| `slow_query.ttl` | String | `90d` | The TTL of the `slow_queries` system table. Default is `90d` when `record_type` is `system_table`. |
323-
| `export_metrics` | -- | -- | The frontend can export its metrics and send to Prometheus compatible service (e.g. `greptimedb` itself) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
324-
| `export_metrics.enable` | Bool | `false` | whether enable export metrics. |
325-
| `export_metrics.write_interval` | String | `30s` | The interval of export metrics. |
326-
| `export_metrics.remote_write` | -- | -- | -- |
327-
| `export_metrics.remote_write.url` | String | `""` | The prometheus remote write endpoint that the metrics send to. The url example can be: `http://127.0.0.1:4000/v1/prometheus/write?db=greptime_metrics`. |
328-
| `export_metrics.remote_write.headers` | InlineTable | -- | HTTP headers of Prometheus remote-write carry. |
329315
| `tracing` | -- | -- | The tracing options. Only effect when compiled with `tokio-console` feature. |
330316
| `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
331317
| `memory` | -- | -- | The memory options. |
@@ -416,12 +402,6 @@
416402
| `logging.otlp_headers` | -- | -- | Additional OTLP headers, only valid when using OTLP http |
417403
| `logging.tracing_sample_ratio` | -- | Unset | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
418404
| `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
419-
| `export_metrics` | -- | -- | The metasrv can export its metrics and send to Prometheus compatible service (e.g. `greptimedb` itself) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
420-
| `export_metrics.enable` | Bool | `false` | whether enable export metrics. |
421-
| `export_metrics.write_interval` | String | `30s` | The interval of export metrics. |
422-
| `export_metrics.remote_write` | -- | -- | -- |
423-
| `export_metrics.remote_write.url` | String | `""` | The prometheus remote write endpoint that the metrics send to. The url example can be: `http://127.0.0.1:4000/v1/prometheus/write?db=greptime_metrics`. |
424-
| `export_metrics.remote_write.headers` | InlineTable | -- | HTTP headers of Prometheus remote-write carry. |
425405
| `tracing` | -- | -- | The tracing options. Only effect when compiled with `tokio-console` feature. |
426406
| `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
427407
| `memory` | -- | -- | The memory options. |
@@ -587,12 +567,6 @@
587567
| `logging.otlp_headers` | -- | -- | Additional OTLP headers, only valid when using OTLP http |
588568
| `logging.tracing_sample_ratio` | -- | Unset | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
589569
| `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
590-
| `export_metrics` | -- | -- | The datanode can export its metrics and send to Prometheus compatible service (e.g. `greptimedb` itself) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
591-
| `export_metrics.enable` | Bool | `false` | whether enable export metrics. |
592-
| `export_metrics.write_interval` | String | `30s` | The interval of export metrics. |
593-
| `export_metrics.remote_write` | -- | -- | -- |
594-
| `export_metrics.remote_write.url` | String | `""` | The prometheus remote write endpoint that the metrics send to. The url example can be: `http://127.0.0.1:4000/v1/prometheus/write?db=greptime_metrics`. |
595-
| `export_metrics.remote_write.headers` | InlineTable | -- | HTTP headers of Prometheus remote-write carry. |
596570
| `tracing` | -- | -- | The tracing options. Only effect when compiled with `tokio-console` feature. |
597571
| `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
598572
| `memory` | -- | -- | The memory options. |

src/catalog/src/system_schema/information_schema/runtime_metrics.rs

Lines changed: 0 additions & 265 deletions
This file was deleted.

src/datanode/src/datanode.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ use object_store::manager::{ObjectStoreManager, ObjectStoreManagerRef};
4444
use object_store::util::normalize_dir;
4545
use query::QueryEngineFactory;
4646
use query::dummy_catalog::{DummyCatalogManager, TableProviderFactoryRef};
47-
use servers::export_metrics::ExportMetricsTask;
4847
use servers::server::ServerHandlers;
4948
use snafu::{OptionExt, ResultExt, ensure};
5049
use store_api::path_utils::WAL_DIR;
@@ -77,7 +76,6 @@ pub struct Datanode {
7776
greptimedb_telemetry_task: Arc<GreptimeDBTelemetryTask>,
7877
leases_notifier: Option<Arc<Notify>>,
7978
plugins: Plugins,
80-
export_metrics_task: Option<ExportMetricsTask>,
8179
}
8280

8381
impl Datanode {
@@ -89,10 +87,6 @@ impl Datanode {
8987

9088
self.start_telemetry();
9189

92-
if let Some(t) = self.export_metrics_task.as_ref() {
93-
t.start(None).context(StartServerSnafu)?
94-
}
95-
9690
self.services.start_all().await.context(StartServerSnafu)
9791
}
9892

@@ -305,10 +299,6 @@ impl DatanodeBuilder {
305299
None
306300
};
307301

308-
let export_metrics_task =
309-
ExportMetricsTask::try_new(&self.opts.export_metrics, Some(&self.plugins))
310-
.context(StartServerSnafu)?;
311-
312302
Ok(Datanode {
313303
services: ServerHandlers::default(),
314304
heartbeat_task,
@@ -317,7 +307,6 @@ impl DatanodeBuilder {
317307
region_event_receiver,
318308
leases_notifier,
319309
plugins: self.plugins.clone(),
320-
export_metrics_task,
321310
})
322311
}
323312

src/frontend/src/frontend.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ use crate::error;
3333
use crate::error::Result;
3434
use crate::heartbeat::HeartbeatTask;
3535
use crate::instance::Instance;
36-
use crate::instance::prom_store::ExportMetricHandler;
3736
use crate::service_config::{
3837
InfluxdbOptions, JaegerOptions, MysqlOptions, OpentsdbOptions, OtlpOptions, PostgresOptions,
3938
PromStoreOptions,

0 commit comments

Comments
 (0)