Closed mesosphere-ci closed 3 years ago
Release beta-dcos-monitoring v1.4.3-beta (automated commit)
Description: Source URL: https://observability-artifacts.s3.amazonaws.com/releases/dcos-monitoring/v1.4.3/stub-universe-dcos-monitoring.json
Changes between revisions 500 => 10403: 0 files added: [] 0 files removed: [] 4 files changed:
--- 500/config.json +++ 10403/config.json @@ -39,8 +39,43 @@ "ALL" ], "default": "INFO" + }, + "logrotate_options": { + "description": "The logrotate options for the DC/OS service.", + "type": "object", + "properties": { + "stdout_max_size": { + "description": "Logrotate stdout max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.", + "type": "string", + "default": "8MB" + }, + "stderr_max_size": { + "description": "Logrotate stderr max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.", + "type": "string", + "default": "8MB" + } + } + }, + "placement_constraints": { + "type": "array", + "items": { + "type": "array", + "items": [ + { + "type": "string" + } + ] + }, + "description": "Placement constraints for the dcos-monitoring scheduler", + "default": [] + }, + "token_interval": { + "description": "The number of seconds to wait between refreshes of the auth token", + "type": "integer", + "default": 3600 } - } + }, + "additionalProperties": false }, "prometheus": { "description": "Prometheus configuration properties", @@ -49,12 +84,12 @@ "cpus": { "description": "Prometheus pod CPU requirements", "type": "number", - "default": 2.0 + "default": 1.0 }, "mem": { "description": "Prometheus pod mem requirements (in MB)", "type": "integer", - "default": 4096 + "default": 1024 }, "volume": { "description": "Prometheus volume requirements", @@ -72,7 +107,7 @@ "size": { "description": "The size of the persistent volume in MB", "type": "integer", - "default": 25000, + "default": 2000, "minimum": 2000 }, "profile": { @@ -80,6 +115,20 @@ "type": "string", "default": "" } + }, + "additionalProperties": false + }, + "prereserved_role": { + "description": "Pre-reserved role name", + "type": "string", + "default": "" + }, + "placement_constraints": { + "type": "string", + "description": "The Marathon-style placement constraints string controlling Prometheus server placement", + "default": "", + "media": { + "type": "application/x-zone-constraints+json" } }, "interval": { @@ -116,7 +165,8 @@ "type": "string", "default": "" } - } + }, + "additionalProperties": false }, "marathon_lb_proxy": { "description": "Configuration for Marathon LB integration", @@ -132,53 +182,334 @@ "type": "string", "default": "" } - } - }, - "alert_rules_repository": { - "description": "Repository for alert rules", + }, + "additionalProperties": false + }, + "remote_write": { + "description": "", "type": "object", "properties": { "url": { - "description": "The URL to the git repository", - "type": "string", - "default": "" - }, - "path": { - "description": "Path in the repository to load rules from (e.g., /, /foo)", - "type": "string", - "default": "" - }, - "reference_name": { - "description": "Git repository reference name (e.g., refs/heads/master)", - "type": "string", - "default": "" - }, - "credentials": { - "description": "Credentials for accessing the repository", + "description": "The URL of the endpoint to send samples to", + "type": "string", + "default": "" + }, + "remote_timeout": { + "description": "Timeout for requests to the remote write endpoint", + "type": "string", + "default": "30s" + }, + "basic_auth": { + "description": "Sets the Authorization header on every remote write request with the configured username and password.password and password_file are mutually exclusive", "type": "object", "properties": { "username": { - "title": "Secret for username", - "description": "Secret name for username of the repository", + "description": "", "type": "string", "default": "" }, "password": { - "title": "Secret for password (or API token)", - "description": "Secret name for password (or API token) of the repository", - "type": "string", - "default": "" - }, - "deploy_key": { - "description": "Secret name for the deploy key", - "type": "string", - "default": "" + "description": "", + "type": "string", + "default": "" + } + }, + "additionalProperties": false + }, + "bearer_token": { + "description": "Sets the `Authorization` header on every remote write request with the configured bearer token.", + "type": "string", + "default": "" + }, + "bearer_token_file": { + "description": "Secret name that contains bearer token file. It sets the `Authorization` header on every remote write request with the bearer token read from the configured file. It is mutually exclusive with `bearer_token`.", + "type": "string", + "title": "bearer token file", + "default": "" + }, + "tls_config": { + "title": "remote write request's TLS settings", + "description": "Configures the remote write request's TLS settings.", + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": false + } + }, + "dependencies": { + "enabled": { + "oneOf": [ + { + "properties": { + "enabled": { + "enum": [ + false + ] + } + } + }, + { + "properties": { + "enabled": { + "enum": [ + true + ] + }, + "ca_file": { + "description": "CA certificate to validate API server certificate with.", + "type": "string", + "default": "" + }, + "cert_file": { + "description": "Certificate for client cert authentication to the server", + "type": "string", + "default": "" + }, + "key_file": { + "description": "key files for client cert authentication to the server", + "type": "string", + "default": "" + }, + "insecure_skip_verify": { + "description": "Disable validation of the server certificate.", + "type": "string", + "default": "" + } + } + } + ] } } + }, + "proxy_url": { + "description": "", + "type": "string", + "default": "" + }, + "queue_config": { + "description": "", + "type": "object", + "properties": { + "capacity": { + "description": "", + "type": "string", + "default": "500" + }, + "max_shards": { + "description": "", + "type": "string", + "default": "1000" + }, + "min_shards": { + "description": "", + "type": "string", + "default": "1" + }, + "max_samples_per_send": { + "description": "", + "type": "string", + "default": "100" + }, + "batch_send_deadline": { + "description": "", + "type": "string", + "default": "5s" + }, + "min_backoff": { + "description": "", + "type": "string", + "default": "30ms" + }, + "max_backoff": { + "description": "", + "type": "string", + "default": "100ms" + } + }, + "additionalProperties": false + } + } + }, + "remote_read": { + "description": "", + "type": "object", + "properties": { + "url": { + "description": "The URL of the endpoint to query from", + "type": "string", + "default": "" + }, + "required_matchers": { + "description": "An optional list of equality matchers which have to be present in a selector to query the remote read endpoint.", + "type": "string", + "default": "" + }, + "remote_timeout": { + "description": "Timeout for requests to the remote read endpoint", + "type": "string", + "default": "1m" + }, + "read_recent": { + "description": "Whether reads should be made for queries for time ranges that the local storage should have complete data for", + "type": "string", + "default": "false" + }, + "basic_auth": { + "description": "Sets the `Authorization` header on every remote read request with the configured username and password.password and password_file are mutually exclusive", + "type": "object", + "properties": { + "username": { + "description": "", + "type": "string", + "default": "" + }, + "password": { + "description": "", + "type": "string", + "default": "" + } + }, + "additionalProperties": false + }, + "bearer_token": { + "description": "Sets the `Authorization` header on every remote read request with the bearer token read from the configured file.", + "type": "string", + "default": "" + }, + "bearer_token_file": { + "description": "Secret name that contains bearer token file. It sets the `Authorization` header on every remote read request with the bearer token read from the configured file. It is mutually exclusive with `bearer_token`.", + "type": "string", + "title": "bearer token file", + "default": "" + }, + "tls_config": { + "title": "remote read request's TLS settings", + "description": "Configures the remote read request's TLS settings.", + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": false + } + }, + "dependencies": { + "enabled": { + "oneOf": [ + { + "properties": { + "enabled": { + "enum": [ + false + ] + } + } + }, + { + "properties": { + "enabled": { + "enum": [ + true + ] + }, + "ca_file": { + "description": "CA certificate to validate API server certificate with.", + "type": "string", + "default": "" + }, + "cert_file": { + "description": "Certificate for client cert authentication to the server", + "type": "string", + "default": "" + }, + "key_file": { + "description": "key files for client cert authentication to the server", + "type": "string", + "default": "" + }, + "insecure_skip_verify": { + "description": "Disable validation of the server certificate.", + "type": "string", + "default": "" + } + } + } + ] + } + } + }, + "proxy_url": { + "description": "", + "type": "string", + "default": "" + } + } + }, + "alert_rules_repository": { + "description": "Repository for alert rules", + "type": "object", + "properties": { + "url": { + "description": "The URL to the git repository", + "type": "string", + "default": "" + }, + "path": { + "description": "Path in the repository to load rules from (e.g., /, /foo)", + "type": "string", + "default": "" + }, + "reference_name": { + "description": "Git repository reference name (e.g., refs/heads/master)", + "type": "string", + "default": "" + }, + "credentials": { + "description": "Credentials (must be stored as DC/OS Secrets in the Secret Store) for accessing the repository", + "type": "object", + "properties": { + "username_secret": { + "description": "Name of the DC/OS Secret storing the username of the repository", + "type": "string", + "default": "" + }, + "password_secret": { + "description": "Name of the DC/OS Secret storing the password (or API token) of the repository", + "type": "string", + "default": "" + }, + "deploy_key_secret": { + "description": "Name of DC/OS Secret stored in the Secret Store for the deploy key", + "type": "string", + "default": "" + } + }, + "additionalProperties": false } } } - } + }, + "additionalProperties": false + }, + "pushgateway": { + "description": "Pushgateway configuration properties", + "type": "object", + "properties": { + "enabled": { + "description": "Whether to enable the Pushgateway service", + "type": "boolean", + "default": false + } + }, + "additionalProperties": false }, "grafana": { "description": "Grafana configuration properties", @@ -187,12 +518,12 @@ "cpus": { "description": "Grafana pod CPU requirements", "type": "number", - "default": 2.0 + "default": 0.5 }, "mem": { "description": "Grafana pod mem requirements (in MB)", "type": "integer", - "default": 4096 + "default": 256 }, "data_volume": { "description": "Grafana data volume requirements", @@ -210,7 +541,7 @@ "size": { "description": "The size of the persistent volume in MB", "type": "integer", - "default": 512, + "default": 50, "minimum": 50 }, "profile": { @@ -218,7 +549,8 @@ "type": "string", "default": "" } - } + }, + "additionalProperties": false }, "ui_port": { "description": "The port to connect to the Grafana UI", @@ -230,28 +562,39 @@ "type": "boolean", "default": true }, - "public": { - "description": "Whether the Grafana instance will be deployed on a public agent or not.", - "type": "boolean", - "default": false - }, "admin_credentials": { - "description": "Username/password for the admin user", - "type": "object", - "properties": { - "username": { - "title": "Secret for username", - "description": "Secret name for username of the admin user", - "type": "string", - "default": "" - }, - "password": { - "title": "Secret for password", - "description": "Secret name for password of the admin user", - "type": "string", - "default": "" - } - } + "description": "Username/password (must be stored as DC/OS Secrets in the Secret Store) for the admin user", + "type": "object", + "properties": { + "username_secret": { + "description": "Name of the DC/OS Secret storing the username of the admin user", + "type": "string", + "default": "" + }, + "password_secret": { + "description": "Name of the DC/OS Secret storing the password of the admin user", + "type": "string", + "default": "" + } + }, + "additionalProperties": false + }, + "config_files": { + "description": "Config files (must be stored as DC/OS Secrets in the Secret Store)", + "type": "object", + "properties": { + "custom": { + "description": "Name of the DC/OS Secret storing grafana.ini file", + "type": "string", + "default": "" + }, + "ldap": { + "description": "Name of the DC/OS Secret storing ldap.toml file", + "type": "string", + "default": "" + } + }, + "additionalProperties": false }, "placement_constraints": { "type": "string", @@ -261,6 +604,16 @@ "type": "application/x-zone-constraints+json" } }, + "use_light_theme": { + "description": "Whether to use the Light theme for dashboards (alternative is the Dark theme)", + "type": "boolean", + "default": true + }, + "plugins": { + "description": "List of plugins that should be installed when Grafana starts (see GF_INSTALL_PLUGINS).", + "type": "string", + "default": "" + }, "default_dashboards": { "description": "Whether to load default Grafana dashboards associated with this package", "type": "boolean", @@ -286,31 +639,32 @@ "default": "" }, "credentials": { - "description": "Credentials for accessing the repository", + "description": "Credentials (must be stored as DC/OS Secrets in the Secret Store) for accessing the repository", "type": "object", "properties": { - "username": { - "title": "Secret for username", - "description": "Secret name for username of the repository", - "type": "string", - "default": "" - }, - "password": { - "title": "Secret for password (or API token)", - "description": "Secret name for password (or API token) of the repository", - "type": "string", - "default": "" - }, - "deploy_key": { - "description": "Secret name for the deploy key", - "type": "string", - "default": "" - } - } - } - } + "username_secret": { + "description": "Name of the DC/OS Secret storing the username of the repository", + "type": "string", + "default": "" + }, + "password_secret": { + "description": "Name of the DC/OS Secret storing the password (or API token) of the repository", + "type": "string", + "default": "" + }, + "deploy_key_secret": { + "description": "Name of the DC/OS Secret storing the deploy key", + "type": "string", + "default": "" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false } - } + }, + "additionalProperties": false }, "alertmanager": { "description": "Alertmanager settings", @@ -319,12 +673,12 @@ "cpus": { "description": "Alertmanager pod CPU requirements", "type": "number", - "default": 1.0 + "default": 0.3 }, "mem": { "description": "Alertmanager pod mem requirements (in MB)", "type": "integer", - "default": 1024 + "default": 512 }, "data_volume": { "description": "Alertmanager data volume requirements", @@ -342,7 +696,7 @@ "size": { "description": "The size of the persistent volume in MB", "type": "integer", - "default": 512, + "default": 50, "minimum": 50 }, "profile": { @@ -350,18 +704,25 @@ "type": "string", "default": "" } - } + }, + "additionalProperties": false }, "secrets": { - "description": "Secrets that will be used by Alertmanager", - "type": "object", - "properties": { - "slack_api_url": { - "description": "Slack webhook url", - "type": "string", - "default": "" - } - } + "description": "DC/OS Secrets stored in the Secret Store that will be used by Alertmanager", + "type": "object", + "properties": { + "slack_api_url_secret": { + "description": "Name of the DC/OS Secret storing the Slack webhook url", + "type": "string", + "default": "" + }, + "smtp_auth_password_secret": { + "description": "Name of the DC/OS Secret storing the SMTP AUTH password", + "type": "string", + "default": "" + } + }, + "additionalProperties": false }, "config_repository": { "description": "Repository for Alertmanager configs", @@ -377,32 +738,38 @@ "type": "string", "default": "" }, + "reference_name": { + "description": "Git repository reference name (e.g., refs/heads/master)", + "type": "string" + }, "credentials": { - "description": "Credentials for accessing the repository", + "description": "Credentials (must be stored as DC/OS Secrets in the Secret Store) for accessing the repository", "type": "object", "properties": { - "username": { - "title": "Secret for username", - "description": "Secret name for username of the repository", - "type": "string", - "default": "" - }, - "password": { - "title": "Secret for password (or API token)", - "description": "Secret name for password (or API token) of the repository", - "type": "string", - "default": "" - }, - "deploy_key": { - "description": "Secret name for the deploy key", - "type": "string", - "default": "" - } - } - } - } + "username_secret": { + "description": "Name of the DC/OS Secret storing the username of the repository", + "type": "string", + "default": "" + }, + "password_secret": { + "description": "Name of the DC/OS Secret storing the password (or API token) of the repository", + "type": "string", + "default": "" + }, + "deploy_key_secret": { + "description": "Name of the DC/OS Secret storing the deploy key", + "type": "string", + "default": "" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false } - } + }, + "additionalProperties": false } - } + }, + "additionalProperties": false } --- 500/marathon.json.mustache +++ 10403/marathon.json.mustache @@ -11,6 +11,7 @@ } }, "cmd": "./init.sh", + "constraints": {{service.placement_constraints}}, "labels": { {{#prometheus.marathon_lb_proxy.enabled}} "HAPROXY_GROUP": "external", @@ -35,34 +36,47 @@ "secrets": { {{/service.service_account_secret}} {{^service.service_account_secret}} - {{#grafana.admin_credentials.username}} + {{#grafana.admin_credentials.username_secret}} "secrets": { - {{/grafana.admin_credentials.username}} + {{/grafana.admin_credentials.username_secret}} + {{^grafana.admin_credentials.username_secret}} + {{#grafana.config_files.custom}} + "secrets": { + {{/grafana.config_files.custom}} + {{/grafana.admin_credentials.username_secret}} {{/service.service_account_secret}} {{#service.service_account_secret}} "serviceCredential": { "source": "{{service.service_account_secret}}" }, {{/service.service_account_secret}} - {{#grafana.admin_credentials.username}} - "grafanaAdminUsername": { "source": "{{grafana.admin_credentials.username}}" }, - "grafanaAdminPassword": { "source": "{{grafana.admin_credentials.password}}" }, - {{/grafana.admin_credentials.username}} + {{#grafana.admin_credentials.username_secret}} + "grafanaAdminUsername": { "source": "{{grafana.admin_credentials.username_secret}}" }, + "grafanaAdminPassword": { "source": "{{grafana.admin_credentials.password_secret}}" }, + {{/grafana.admin_credentials.username_secret}} {{#service.service_account_secret}} + {{#grafana.config_files.custom}} + {{#grafana.config_files.custom}} + "grafanaCustomConfigFile": { "source": "{{grafana.config_files.custom}}" }, + {{/grafana.config_files.custom}} + {{#grafana.config_files.ldap}} + "grafanaLdapConfigFile": { "source": "{{grafana.config_files.ldap}}" }, + {{/grafana.config_files.ldap}} + {{/grafana.config_files.custom}} "dummy": { "source": "dummy" } }, {{/service.service_account_secret}} {{^service.service_account_secret}} - {{#grafana.admin_credentials.username}} + {{#grafana.admin_credentials.username_secret}} "dummy": { "source": "dummy" } }, - {{/grafana.admin_credentials.username}} + {{/grafana.admin_credentials.username_secret}} {{/service.service_account_secret}} "env": { "MESOS_API_VERSION": "V1", "PACKAGE_NAME": "beta-dcos-monitoring", - "PACKAGE_VERSION": "v0.5.0-beta", - "PACKAGE_BUILD_TIME_EPOCH_MS": "1557256222442", - "PACKAGE_BUILD_TIME_STR": "Tue May 07 2019 19:10:22 +0000", + "PACKAGE_VERSION": "v1.4.3-beta", + "PACKAGE_BUILD_TIME_EPOCH_MS": "1606901249902", + "PACKAGE_BUILD_TIME_STR": "Wed Dec 02 2020 09:27:29 +0000", "FRAMEWORK_NAME": "{{service.name}}", "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", @@ -70,6 +84,9 @@ "SERVICE_PRINCIPAL": "{{service.service_account}}", "SERVICE_USER": "{{service.user}}", + {{#prometheus.prereserved_role}} + "PROMETHEUS_PRERESERVED_ROLE": "{{prometheus.prereserved_role}}", + {{/prometheus.prereserved_role}} "PROMETHEUS_CPUS": "{{prometheus.cpus}}", "PROMETHEUS_MEM": "{{prometheus.mem}}", "PROMETHEUS_DCOS_METRICS_NODE_PORT": "{{prometheus.dcos_metrics_node_port}}", @@ -77,6 +94,7 @@ "PROMETHEUS_VOLUME_SIZE": "{{prometheus.volume.size}}", "PROMETHEUS_VOLUME_PROFILE": "{{prometheus.volume.profile}}", "PROMETHEUS_STORAGE_TSDB_RETENTION": "{{prometheus.storage_tsdb_retention}}", + "PROMETHEUS_PLACEMENT_CONSTRAINTS": "{{prometheus.placement_constraints}}", "PROMETHEUS_ADMIN_ROUTER_PROXY_ENABLED": "{{prometheus.admin_router_proxy.enabled}}", "PROMETHEUS_ADMIN_ROUTER_PROXY_URL": "{{prometheus.admin_router_proxy.url}}", "PROMETHEUS_MARATHON_LB_PROXY_ENABLED": "{{prometheus.marathon_lb_proxy.enabled}}", @@ -84,19 +102,58 @@ "PROMETHEUS_ALERT_RULES_REPOSITORY_URL": "{{prometheus.alert_rules_repository.url}}", "PROMETHEUS_ALERT_RULES_REPOSITORY_PATH": "{{prometheus.alert_rules_repository.path}}", "PROMETHEUS_ALERT_RULES_REPOSITORY_REFERENCE_NAME": "{{prometheus.alert_rules_repository.reference_name}}", - "PROMETHEUS_ALERT_RULES_REPOSITORY_USERNAME": "{{prometheus.alert_rules_repository.credentials.username}}", - "PROMETHEUS_ALERT_RULES_REPOSITORY_PASSWORD": "{{prometheus.alert_rules_repository.credentials.password}}", - "PROMETHEUS_ALERT_RULES_REPOSITORY_DEPLOY_KEY":"{{prometheus.alert_rules_repository.credentials.deploy_key}}", + "PROMETHEUS_ALERT_RULES_REPOSITORY_USERNAME": "{{prometheus.alert_rules_repository.credentials.username_secret}}", + "PROMETHEUS_ALERT_RULES_REPOSITORY_PASSWORD": "{{prometheus.alert_rules_repository.credentials.password_secret}}", + "PROMETHEUS_ALERT_RULES_REPOSITORY_DEPLOY_KEY":"{{prometheus.alert_rules_repository.credentials.deploy_key_secret}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_URL":"{{prometheus.remote_write.url}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_REMOTE_TIMEOUT":"{{prometheus.remote_write.remote_timeout}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_USERNAME":"{{prometheus.remote_write.basic_auth.username}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_PASSWORD":"{{prometheus.remote_write.basic_auth.password}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_BEARER_TOKEN":"{{prometheus.remote_write.bearer_token}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_BEARER_TOKEN_FILE":"{{prometheus.remote_write.bearer_token_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_PROXY_URL":"{{prometheus.remote_write.proxy_url}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_TLS_CONFIG":"{{prometheus.remote_write.tls_config.enabled}}", + {{#prometheus.remote_write.tls_config.enabled}} + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_CA_FILE":"{{prometheus.remote_write.tls_config.ca_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_CERT_FILE":"{{prometheus.remote_write.tls_config.cert_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_KEY_FILE":"{{prometheus.remote_write.tls_config.key_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_INSECURE_SKIP_VERIFY":"{{prometheus.remote_write.tls_config.insecure_skip_verify}}", + {{/prometheus.remote_write.tls_config.enabled}} + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_CAPACITY":"{{prometheus.remote_write.queue_config.capacity}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_MAX_SHARDS":"{{prometheus.remote_write.queue_config.max_shards}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_MIN_SHARDS":"{{prometheus.remote_write.queue_config.min_shards}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_MAX_SAMPLES_PER_SEND":"{{prometheus.remote_write.queue_config.max_samples_per_send}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_BATCH_SEND_DEADLINE":"{{prometheus.remote_write.queue_config.batch_send_deadline}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_MIN_BACKOFF":"{{prometheus.remote_write.queue_config.min_backoff}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_WRITE_MAX_BACKOFF":"{{prometheus.remote_write.queue_config.max_backoff}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_URL":"{{prometheus.remote_read.url}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_REQUIRED_MATCHERS":"{{prometheus.remote_read.required_matchers}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_REMOTE_TIMEOUT":"{{prometheus.remote_read.remote_timeout}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_READ_RECENT":"{{prometheus.remote_read.read_recent}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_USERNAME":"{{prometheus.remote_read.basic_auth.username}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_PASSWORD":"{{prometheus.remote_read.basic_auth.password}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_BEARER_TOKEN":"{{prometheus.remote_read.bearer_token}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_BEARER_TOKEN_FILE":"{{prometheus.remote_read.bearer_token_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_PROXY_URL":"{{prometheus.remote_read.proxy_url}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_TLS_CONFIG":"{{prometheus.remote_read.tls_config.enabled}}", + {{#prometheus.remote_read.tls_config.enabled}} + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_CA_FILE":"{{prometheus.remote_read.tls_config.ca_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_CERT_FILE":"{{prometheus.remote_read.tls_config.cert_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_KEY_FILE":"{{prometheus.remote_read.tls_config.key_file}}", + "TASKCFG_ALL_PROMETHEUS_REMOTE_READ_INSECURE_SKIP_VERIFY":"{{prometheus.remote_read.tls_config.insecure_skip_verify}}", + {{/prometheus.remote_read.tls_config.enabled}} "SCRAPE_INTERVAL": "{{prometheus.interval}}", "SCRAPE_TIMEOUT": "{{prometheus.timeout}}", - {{#prometheus.alert_rules_repository.credentials.username}} + {{#prometheus.alert_rules_repository.credentials.username_secret}} "PROMETHEUS_ALERT_RULES_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/prometheus.alert_rules_repository.credentials.username}} - {{^prometheus.alert_rules_repository.credentials.username}} - {{#prometheus.alert_rules_repository.credentials.deploy_key}} + {{/prometheus.alert_rules_repository.credentials.username_secret}} + {{^prometheus.alert_rules_repository.credentials.username_secret}} + {{#prometheus.alert_rules_repository.credentials.deploy_key_secret}} "PROMETHEUS_ALERT_RULES_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/prometheus.alert_rules_repository.credentials.deploy_key}} - {{/prometheus.alert_rules_repository.credentials.username}} + {{/prometheus.alert_rules_repository.credentials.deploy_key_secret}} + {{/prometheus.alert_rules_repository.credentials.username_secret}} + + "PUSHGATEWAY_ENABLED": "{{pushgateway.enabled}}", "GRAFANA_CPUS": "{{grafana.cpus}}", "GRAFANA_MEM": "{{grafana.mem}}", @@ -105,52 +162,63 @@ "GRAFANA_DATA_VOLUME_PROFILE": "{{grafana.data_volume.profile}}", "GRAFANA_UI_PORT": "{{grafana.ui_port}}", "GRAFANA_ADMIN_ROUTER_PROXY": "{{grafana.admin_router_proxy}}", - "GRAFANA_PUBLIC": "{{grafana.public}}", - "GRAFANA_ADMIN_CREDENTIALS_USERNAME": "{{grafana.admin_credentials.username}}", - "GRAFANA_ADMIN_CREDENTIALS_PASSWORD": "{{grafana.admin_credentials.password}}", - {{#grafana.admin_credentials.username}} + "GRAFANA_ADMIN_CREDENTIALS_USERNAME": "{{grafana.admin_credentials.username_secret}}", + "GRAFANA_ADMIN_CREDENTIALS_PASSWORD": "{{grafana.admin_credentials.password_secret}}", + {{#grafana.admin_credentials.username_secret}} "GRAFANA_ADMIN_CREDENTIALS_USERNAME_VALUE": { "secret": "grafanaAdminUsername" }, "GRAFANA_ADMIN_CREDENTIALS_PASSWORD_VALUE": { "secret": "grafanaAdminPassword" }, - {{/grafana.admin_credentials.username}} + {{/grafana.admin_credentials.username_secret}} + {{#grafana.config_files.custom}} + "GRAFANA_CUSTOM_CONFIG_FILE_SECRET": "{{grafana.config_files.custom}}", + {{/grafana.config_files.custom}} + {{#grafana.config_files.ldap}} + "GRAFANA_LDAP_CONFIG_FILE_SECRET": "{{grafana.config_files.ldap}}", + {{/grafana.config_files.ldap}} "GRAFANA_PLACEMENT_CONSTRAINTS": "{{grafana.placement_constraints}}", + "GRAFANA_USE_LIGHT_THEME": "{{grafana.use_light_theme}}", + "GRAFANA_INSTALL_PLUGINS": "{{grafana.plugins}}", "GRAFANA_DEFAULT_DASHBOARDS": "{{grafana.default_dashboards}}", "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_URL": "{{grafana.dashboard_config_repository.url}}", "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_PATH": "{{grafana.dashboard_config_repository.path}}", "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_REFERENCE_NAME": "{{grafana.dashboard_config_repository.reference_name}}", - "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_USERNAME": "{{grafana.dashboard_config_repository.credentials.username}}", - "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_PASSWORD": "{{grafana.dashboard_config_repository.credentials.password}}", - "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_DEPLOY_KEY":"{{grafana.dashboard_config_repository.credentials.deploy_key}}", - {{#grafana.dashboard_config_repository.credentials.username}} + "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_USERNAME": "{{grafana.dashboard_config_repository.credentials.username_secret}}", + "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_PASSWORD": "{{grafana.dashboard_config_repository.credentials.password_secret}}", + "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_DEPLOY_KEY":"{{grafana.dashboard_config_repository.credentials.deploy_key_secret}}", + {{#grafana.dashboard_config_repository.credentials.username_secret}} "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/grafana.dashboard_config_repository.credentials.username}} - {{^grafana.dashboard_config_repository.credentials.username}} - {{#grafana.dashboard_config_repository.credentials.deploy_key}} + {{/grafana.dashboard_config_repository.credentials.username_secret}} + {{^grafana.dashboard_config_repository.credentials.username_secret}} + {{#grafana.dashboard_config_repository.credentials.deploy_key_secret}} "GRAFANA_DASHBOARD_CONFIG_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/grafana.dashboard_config_repository.credentials.deploy_key}} - {{/grafana.dashboard_config_repository.credentials.username}} + {{/grafana.dashboard_config_repository.credentials.deploy_key_secret}} + {{/grafana.dashboard_config_repository.credentials.username_secret}} "ALERTMANAGER_CPUS": "{{alertmanager.cpus}}", "ALERTMANAGER_MEM": "{{alertmanager.mem}}", "ALERTMANAGER_DATA_VOLUME_TYPE": "{{alertmanager.data_volume.type}}", "ALERTMANAGER_DATA_VOLUME_SIZE": "{{alertmanager.data_volume.size}}", "ALERTMANAGER_DATA_VOLUME_PROFILE": "{{alertmanager.data_volume.profile}}", - "ALERTMANAGER_SECRETS_SLACK_API_URL": "{{alertmanager.secrets.slack_api_url}}", + "ALERTMANAGER_SECRETS_SLACK_API_URL": "{{alertmanager.secrets.slack_api_url_secret}}", + "ALERTMANAGER_SECRETS_SMTP_AUTH_PASSWORD": "{{alertmanager.secrets.smtp_auth_password_secret}}", "ALERTMANAGER_CONFIG_REPOSITORY_URL": "{{alertmanager.config_repository.url}}", "ALERTMANAGER_CONFIG_REPOSITORY_PATH": "{{alertmanager.config_repository.path}}", - "ALERTMANAGER_CONFIG_REPOSITORY_USERNAME": "{{alertmanager.config_repository.credentials.username}}", - "ALERTMANAGER_CONFIG_REPOSITORY_PASSWORD": "{{alertmanager.config_repository.credentials.password}}", - "ALERTMANAGER_CONFIG_REPOSITORY_DEPLOY_KEY": "{{alertmanager.config_repository.credentials.deploy_key}}", + {{#alertmanager.config_repository.reference_name}} + "ALERTMANAGER_CONFIG_REPOSITORY_REFERENCE_NAME": "{{alertmanager.config_repository.reference_name}}", + {{/alertmanager.config_repository.reference_name}} + "ALERTMANAGER_CONFIG_REPOSITORY_USERNAME": "{{alertmanager.config_repository.credentials.username_secret}}", + "ALERTMANAGER_CONFIG_REPOSITORY_PASSWORD": "{{alertmanager.config_repository.credentials.password_secret}}", + "ALERTMANAGER_CONFIG_REPOSITORY_DEPLOY_KEY": "{{alertmanager.config_repository.credentials.deploy_key_secret}}", {{#alertmanager.config_repository.url}} "ALERTMANAGER_ENABLED": "true", {{/alertmanager.config_repository.url}} - {{#alertmanager.config_repository.credentials.username}} + {{#alertmanager.config_repository.credentials.username_secret}} "ALERTMANAGER_CONFIG_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/alertmanager.config_repository.credentials.username}} - {{^alertmanager.config_repository.credentials.username}} - {{#alertmanager.config_repository.credentials.deploy_key}} + {{/alertmanager.config_repository.credentials.username_secret}} + {{^alertmanager.config_repository.credentials.username_secret}} + {{#alertmanager.config_repository.credentials.deploy_key_secret}} "ALERTMANAGER_CONFIG_REPOSITORY_CREDENTIALS_ENABLED": "true", - {{/alertmanager.config_repository.credentials.deploy_key}} - {{/alertmanager.config_repository.credentials.username}} + {{/alertmanager.config_repository.credentials.deploy_key_secret}} + {{/alertmanager.config_repository.credentials.username_secret}} {{#service.service_account_secret}} "SERVICE_SERVICE_ACCOUNT_SECRET": "{{service.service_account_secret}}", @@ -168,12 +236,17 @@ "GRAFANA_IMAGE": "{{resource.assets.container.docker.grafana}}", "PUSHGATEWAY_IMAGE": "{{resource.assets.container.docker.pushgateway}}", "DISCOVERY_HELPER_URI": "{{resource.assets.uris.discovery-helper}}", + "DISCOVERY_HELPER_TOKEN_INTERVAL": "{{service.token_interval}}", "DASHBOARD_REFRESHER_URI": "{{resource.assets.uris.dashboard-refresher}}", "ALERTMANAGER_CONFIG_URI": "{{resource.assets.uris.alertmanager-config}}", "DEFAULT_DASHBOARDS_MASTER_URI": "{{resource.assets.uris.default-dashboards-master-tar-gz}}", "DEFAULT_DASHBOARDS_1_12_X_URI": "{{resource.assets.uris.default-dashboards-1-12-x-tar-gz}}", + "DEFAULT_DASHBOARDS_1_13_X_URI": "{{resource.assets.uris.default-dashboards-1-13-x-tar-gz}}", + "DEFAULT_DASHBOARDS_2_0_X_URI": "{{resource.assets.uris.default-dashboards-2-0-x-tar-gz}}", "FETCHER_URI": "{{resource.assets.uris.fetcher}}", - "ALERTMANAGER_URI": "{{resource.assets.uris.alertmanager-tar-gz}}" + "ALERTMANAGER_URI": "{{resource.assets.uris.alertmanager-tar-gz}}", + "CONTAINER_LOGGER_LOGROTATE_MAX_STDOUT_SIZE": "{{service.logrotate_options.stdout_max_size}}", + "CONTAINER_LOGGER_LOGROTATE_MAX_STDERR_SIZE": "{{service.logrotate_options.stderr_max_size}}" }, "uris": [ "{{resource.assets.uris.bootstrap-zip}}", @@ -188,7 +261,7 @@ }, "healthChecks": [ { - "protocol": "HTTP", + "protocol": "MESOS_HTTP", "path": "/v1/health", "gracePeriodSeconds": 900, "intervalSeconds": 30, @@ -210,4 +283,4 @@ "name": "proxy" } ] -} +}--- 500/package.json +++ 10403/package.json @@ -1,16 +1,22 @@ { "packagingVersion": "4.0", "upgradesFrom": [ - "v0.5.0-beta" + "v1.4.0-beta", + "v1.4.1-beta", + "v1.4.2-beta", + "v1.4.3-beta" ], "downgradesTo": [ - "v0.5.0-beta" + "v1.4.0-beta", + "v1.4.1-beta", + "v1.4.2-beta", + "v1.4.3-beta" ], "minDcosReleaseVersion": "1.12", "name": "beta-dcos-monitoring", - "version": "v0.5.0-beta", + "version": "v1.4.3-beta", "maintainer": "support@mesosphere.io", - "description": "Makes it easy to monitor DC/OS components and your services on the DC/OS cluster", + "description": "Makes it easy to monitor DC/OS components and your services on the DC/OS cluster.", "selected": false, "framework": true, "tags": [ @@ -22,7 +28,7 @@ "monitoring", "prometheus" ], - "preInstallNotes": "This DC/OS Service is currently in preview.", + "preInstallNotes": "Default configuration requires 2 agent nodes with: 2.0 CPU | 2048 MB MEM | 2100 MB Disk", "postInstallNotes": "Package dcos-monitoring is being installed!\n\n\tDocumentation: https://docs.mesosphere.com/service-docs/dcos-monitoring/\n\tIssues: https://docs.mesosphere.com/support/", "postUninstallNotes": "Package dcos-monitoring is being uninstalled.", "licenses": [ @@ -31,5 +37,5 @@ "url": "https://www.apache.org/licenses/LICENSE-2.0" } ], - "lastUpdated": 1571120354 -} + "lastUpdated": 1606901251 +}--- 500/resource.json +++ 10403/resource.json @@ -2,32 +2,34 @@ "assets": { "container": { "docker": { - "pushgateway": "prom/pushgateway:v0.5.2", - "grafana": "grafana/grafana:5.3.4", - "nginx": "nginx:1.15.7" + "pushgateway": "prom/pushgateway:v1.2.0", + "grafana": "grafana/grafana:7.1.5-ubuntu", + "nginx": "nginx:1.19.2" } }, "uris": { - "jre-tar-gz": "https://downloads.mesosphere.com/java/server-jre-8u192-linux-x64.tar.gz", - "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.12.0.tar.gz", - "scheduler-zip": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/scheduler.zip", - "bootstrap-zip": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.55.2/bootstrap.zip", - "scheduler-assets-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/scheduler-assets.tar.gz", - "prometheus-tar-gz": "https://downloads.mesosphere.com/prometheus/assets/prometheus-2.2.1.linux-amd64.tar.gz", - "discovery-helper": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/discovery-helper.zip", - "dashboard-refresher": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/dashboard-refresher.zip", - "alertmanager-config": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/alertmanager-config.zip", - "fetcher": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/fetcher.zip", - "default-dashboards-master-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/default-dashboards-master.tar.gz", - "default-dashboards-1-12-x-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/default-dashboards-1.12.x.tar.gz", - "alertmanager-tar-gz": "https://github.com/prometheus/alertmanager/releases/download/v0.15.2/alertmanager-0.15.2.linux-amd64.tar.gz", - "jq": "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" + "jre-tar-gz": "https://downloads.mesosphere.com/java/openjdk-jre-11.0.3.7-hotspot-linux-x64.tar.gz", + "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.14-beta.tar.gz", + "scheduler-zip": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/scheduler.zip", + "bootstrap-zip": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.58.0-rc3/bootstrap.zip", + "scheduler-assets-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/scheduler-assets.tar.gz", + "prometheus-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/prometheus-2.20.1.linux-amd64.tar.gz", + "discovery-helper": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/discovery-helper.zip", + "dashboard-refresher": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/dashboard-refresher.zip", + "alertmanager-config": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/alertmanager-config.zip", + "fetcher": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/fetcher.zip", + "default-dashboards-master-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/default-dashboards-master.tar.gz", + "default-dashboards-1-12-x-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/default-dashboards-1.12.x.tar.gz", + "default-dashboards-1-13-x-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/default-dashboards-1.13.x.tar.gz", + "default-dashboards-2-0-x-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/default-dashboards-2.0.x.tar.gz", + "alertmanager-tar-gz": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/alertmanager-0.21.0.linux-amd64.tar.gz", + "jq": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/jq-linux64" } }, "images": { - "icon-large": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/icon-large.png", - "icon-medium": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/icon-medium.png", - "icon-small": "https://downloads.mesosphere.com/dcos-monitoring/assets/v0.5.0-beta/icon-small.png" + "icon-large": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/icon-large.png", + "icon-medium": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/icon-medium.png", + "icon-small": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/icon-small.png" }, "cli": { "binaries": { @@ -36,11 +38,11 @@ "contentHash": [ { "algo": "sha256", - "value": "c329d60aa5fea372115c371814a141f6615819db51935bd09a8265c8978115ac" + "value": "8cb98d2874d9a3b05cb084f417c929fdaf1c094698d8c18cda516c98a1a9ba09" } ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.55.2/dcos-service-cli-darwin" + "kind": "zip", + "url": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/dcos-monitoring-cli-darwin.zip" } }, "linux": { @@ -48,11 +50,11 @@ "contentHash": [ { "algo": "sha256", - "value": "9690330cd5d7017ab7d747e31b28d30f817cf35cb8db700a5ceebaf628d0d299" + "value": "39907760f2e069536d81cf7ea02096c0679af9ab87fcde916049d35357c1249a" } ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.55.2/dcos-service-cli-linux" + "kind": "zip", + "url": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/dcos-monitoring-cli-linux.zip" } }, "windows": { @@ -60,11 +62,11 @@ "contentHash": [ { "algo": "sha256", - "value": "75a6d593848f18b6fc5050f7dde18fb91c659b5b62825ba0eca0e8a5286d46bf" + "value": "6462ef08fcfa391639e72fc86de6046122fe12dd363c25fbf76929381ef7b532" } ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.55.2/dcos-service-cli.exe" + "kind": "zip", + "url": "https://downloads.mesosphere.com/dcos-monitoring/assets/v1.4.3-beta/dcos-monitoring-cli-windows.zip" } } }
Release beta-dcos-monitoring v1.4.3-beta (automated commit)
Description: Source URL: https://observability-artifacts.s3.amazonaws.com/releases/dcos-monitoring/v1.4.3/stub-universe-dcos-monitoring.json
Changes between revisions 500 => 10403: 0 files added: [] 0 files removed: [] 4 files changed: