diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana.xml index 2aa3048f1..d15db89ee 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/configuration/grafana.xml @@ -19,27 +19,6 @@ --> - - hbase_user_nproc_limit - - - nofile_limit - 128000 - Max open files limit - - - nproc_limit - 65536 - Max number of processes limit - - - custom_limit - 32000 - Custom limit for another resource - - - Max number of processes limit setting for HBase user. - content This is the freemarker template for grafana.ini file diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/configuration/prometheus.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/configuration/prometheus.xml index 6c76e592c..1f249904a 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/configuration/prometheus.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/configuration/prometheus.xml @@ -17,39 +17,22 @@ ~ specific language governing permissions and limitations ~ under the License. --> - - - - - - - - - - - - - - - - - - - - - - - + + + scrape_interval + 15s + Global, scrape targets every scrape_interval. + scrape_jobs - scrape_config1 + scrape_self job_name - job + prometheus Job name @@ -84,14 +67,6 @@ global: # Here it's Prometheus itself. scrape_configs: # The job name is added as a label `job=` to any timeseries scraped from this config. - - job_name: 'prometheus' - - # Override the global default and scrape targets from this job every 5 seconds. - scrape_interval: 5s - - static_configs: - - targets: ['localhost:9090'] - <#list scrape_jobs as job> - job_name: '${job.name}' diff --git a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java index 9522846eb..9ee3f5e48 100644 --- a/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java +++ b/bigtop-manager-stack/bigtop-manager-stack-infra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusParams.java @@ -43,10 +43,12 @@ public class PrometheusParams extends InfraParams { private List> prometheusScrapeJobs; private String prometheusContent; + private String prometheusScrapeInterval; public PrometheusParams(CommandPayload commandPayload) { super(commandPayload); globalParamsMap.put("scrape_jobs", prometheusScrapeJobs); + globalParamsMap.put("scrape_interval", prometheusScrapeInterval); } public String dataDir() { @@ -67,6 +69,7 @@ public Map scrapeConfigs() { List> jobs = new ArrayList<>(); Map configuration = LocalSettings.configurations(getServiceName(), "prometheus"); prometheusContent = (String) configuration.get("content"); + prometheusScrapeInterval = (String) configuration.get("scrape_interval"); log.info(configuration.toString()); @SuppressWarnings("unchecked") Map scrapeJobs = (Map) configuration.get("scrape_jobs");