From db0fbd0c4b3629073e07dfed39a67fd1922bb7bf Mon Sep 17 00:00:00 2001 From: Charles Baker Date: Fri, 30 Nov 2018 12:39:35 -0500 Subject: [PATCH 01/13] Extending functionality of Grafana package. --- repo/packages/G/grafana/7/config.json | 141 ++++++++++++++++++ .../G/grafana/7/marathon.json.mustache | 96 ++++++++++++ repo/packages/G/grafana/7/package.json | 23 +++ repo/packages/G/grafana/7/resource.json | 62 ++++++++ 4 files changed, 322 insertions(+) create mode 100644 repo/packages/G/grafana/7/config.json create mode 100644 repo/packages/G/grafana/7/marathon.json.mustache create mode 100644 repo/packages/G/grafana/7/package.json create mode 100644 repo/packages/G/grafana/7/resource.json diff --git a/repo/packages/G/grafana/7/config.json b/repo/packages/G/grafana/7/config.json new file mode 100644 index 000000000..538ad0c0e --- /dev/null +++ b/repo/packages/G/grafana/7/config.json @@ -0,0 +1,141 @@ +{ + "type": "object", + "properties": { + "service": { + "type": "object", + "description": "DC/OS service configuration properties", + "properties": { + "name": { + "description": "The name of the service instance", + "type": "string", + "default": "grafana", + "title": "Service name" + }, + "user": { + "description": "The user that the service will run as.", + "type": "string", + "default": "root", + "title": "User" + }, + "service_account": { + "description": "The service account for DC/OS service authentication. This is typically left empty to use the default unless service authentication is needed. The value given here is passed as the principal of Mesos framework.", + "type": "string", + "default": "" + }, + "service_account_secret": { + "description": "Name of the Secret Store credentials to use for DC/OS service authentication. This should be left empty unless service authentication is needed.", + "type": "string", + "default": "", + "title": "Credential secret name (optional)" + }, + "mesos_api_version": { + "description": "Configures the Mesos API version to use. Possible values: V0 (non-HTTP), V1 (HTTP)", + "type": "string", + "enum": [ + "V0", + "V1" + ], + "default": "V1" + }, + "log_level": { + "description": "The log level for the DC/OS service.", + "type": "string", + "enum": [ + "OFF", + "FATAL", + "ERROR", + "WARN", + "INFO", + "DEBUG", + "TRACE", + "ALL" + ], + "default": "INFO" + } + }, + "required": [ + "name", + "user" + ] + }, + "grafana": { + "description": "grafana pod configuration properties", + "type": "object", + "properties": { + "cpus": { + "description": "Grafana pod CPU requirements", + "type": "number", + "default": 0.2 + }, + "mem": { + "description": "Grafana pod mem requirements (in MB)", + "type": "integer", + "default": 1024 + }, + "volume": { + "description": "Grafana volume requirements", + "type": "object", + "properties": { + "path": { + "description": "Location of persistent volume to store data", + "type": "string", + "default": "/tmp" + }, + "type": { + "description": "The type of persistent volume to use, one of ROOT or MOUNT", + "type": "string", + "default": "ROOT", + "enum": [ + "ROOT", + "MOUNT" + ] + }, + "size": { + "description": "The size of the persistent volume in MB", + "type": "integer", + "default": 512, + "minimum": 512 + } + } + }, + "ini": { + "description": "Base64 encoded grafana.ini", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "##################### Grafana Configuration Defaults ##################### # # Do not modify this file in grafana installs # # possible values : production, development app_mode = production # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty instance_name = ${HOSTNAME} #################################### Paths ############################### [paths] # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) data = data # Temporary files in `data` directory older than given duration will be removed temp_data_lifetime = 24h # Directory where grafana can store logs logs = data/log # Directory where grafana will automatically scan and look for plugins plugins = data/plugins # folder that contains provisioning config files that grafana will apply on startup and while running. provisioning = conf/provisioning #################################### Server ############################## [server] # Protocol (http, https, socket) protocol = http # The ip address to bind to, empty will bind to all interfaces http_addr = # The http port to use http_port = 3000 # The public facing domain name used to access grafana from a browser domain = localhost # Redirect to correct domain if host header does not match domain # Prevents DNS rebinding attacks enforce_domain = false # The full public facing url root_url = %(protocol)s://%(domain)s:%(http_port)s/ # Log web requests router_logging = false # the path relative working path static_root_path = public # enable gzip enable_gzip = false # https certs & key file cert_file = cert_key = # Unix socket path socket = /tmp/grafana.sock #################################### Database ############################ [database] # You can configure the database connection by specifying type, host, name, user and password # as separate properties or as on string using the url property. # Either "mysql", "postgres" or "sqlite3", it's your choice type = sqlite3 host = 127.0.0.1:3306 name = grafana user = root # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" password = # Use either URL or the previous fields to configure the database # Example: mysql://user:secret@host:port/database url = # Max idle conn setting default is 2 max_idle_conn = 2 # Max conn setting default is 0 (mean not set) max_open_conn = # Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) conn_max_lifetime = 14400 # Set to true to log the sql calls and execution times. log_queries = # For "postgres", use either "disable", "require" or "verify-full" # For "mysql", use either "true", "false", or "skip-verify". ssl_mode = disable ca_cert_path = client_key_path = client_cert_path = server_cert_name = # For "sqlite3" only, path relative to data_path setting path = grafana.db #################################### Session ############################# [session] # Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file" provider = file # Provider config options # memory: not have any config yet # file: session dir path, is relative to grafana data_path # redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana` # postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable # mysql: go-sql-driver/mysql dsn config string, examples: # `user:password@tcp(127.0.0.1:3306)/database_name` # `user:password@unix(/var/run/mysqld/mysqld.sock)/database_name` # memcache: 127.0.0.1:11211 provider_config = sessions # Session cookie name cookie_name = grafana_sess # If you use session in https only, default is false cookie_secure = false # Session life time, default is 86400 session_life_time = 86400 gc_interval_time = 86400 # Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) conn_max_lifetime = 14400 #################################### Data proxy ########################### [dataproxy] # This enables data proxy logging, default is false logging = false #################################### Analytics ########################### [analytics] # Server reporting, sends usage counters to stats.grafana.org every 24 hours. # No ip addresses are being tracked, only simple counters to track # running instances, dashboard and error counts. It is very helpful to us. # Change this option to false to disable reporting. reporting_enabled = true # Set to false to disable all checks to https://grafana.com # for new versions (grafana itself and plugins), check is used # in some UI views to notify that grafana or plugin update exists # This option does not cause any auto updates, nor send any information # only a GET request to https://grafana.com to get latest versions check_for_updates = true # Google Analytics universal tracking code, only enabled if you specify an id here google_analytics_ua_id = # Google Tag Manager ID, only enabled if you specify an id here google_tag_manager_id = #################################### Security ############################ [security] # default admin user, created on startup admin_user = admin # default admin password, can be changed before first start of grafana, or in profile settings admin_password = admin # used for signing secret_key = SW2YcwTIb9zpOOhoPsMm # Auto-login remember days login_remember_days = 7 cookie_username = grafana_user cookie_remember_name = grafana_remember # disable gravatar profile images disable_gravatar = false # data source proxy whitelist (ip_or_domain:port separated by spaces) data_source_proxy_whitelist = # disable protection against brute force login attempts disable_brute_force_login_protection = false #################################### Snapshots ########################### [snapshots] # snapshot sharing options external_enabled = true external_snapshot_url = https://snapshots-origin.raintank.io external_snapshot_name = Publish to snapshot.raintank.io # remove expired snapshot snapshot_remove_expired = true #################################### Dashboards ################## [dashboards] # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1 versions_to_keep = 20 #################################### Users ############################### [users] # disable user signup / registration allow_sign_up = false # Allow non admin users to create organizations allow_org_create = false # Set to true to automatically assign new users to the default organization (id 1) auto_assign_org = true # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true) auto_assign_org_id = 1 # Default role new users will be automatically assigned (if auto_assign_org above is set to true) auto_assign_org_role = Viewer # Require email validation before sign up completes verify_email_enabled = false # Background text for the user field on the login page login_hint = email or username # Default UI theme ("dark" or "light") default_theme = dark # External user management external_manage_link_url = external_manage_link_name = external_manage_info = # Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard. viewers_can_edit = false [auth] # Set to true to disable (hide) the login form, useful if you use OAuth disable_login_form = false # Set to true to disable the signout link in the side menu. useful if you use auth.proxy disable_signout_menu = false # URL to redirect the user to after sign out signout_redirect_url = #################################### Anonymous Auth ###################### [auth.anonymous] # enable anonymous access enabled = false # specify organization name that should be used for unauthenticated users org_name = Main Org. # specify role for unauthenticated users org_role = Viewer #################################### Github Auth ######################### [auth.github] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email,read:org auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user team_ids = allowed_organizations = #################################### GitLab Auth ######################### [auth.gitlab] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = api auth_url = https://gitlab.com/oauth/authorize token_url = https://gitlab.com/oauth/token api_url = https://gitlab.com/api/v4 allowed_groups = #################################### Google Auth ######################### [auth.google] enabled = false allow_sign_up = true client_id = some_client_id client_secret = some_client_secret scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email auth_url = https://accounts.google.com/o/oauth2/auth token_url = https://accounts.google.com/o/oauth2/token api_url = https://www.googleapis.com/oauth2/v1/userinfo allowed_domains = hosted_domain = #################################### Grafana.com Auth #################### # legacy key names (so they work in env variables) [auth.grafananet] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email allowed_organizations = [auth.grafana_com] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email allowed_organizations = #################################### Generic OAuth ####################### [auth.generic_oauth] name = OAuth enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email email_attribute_name = email:primary auth_url = token_url = api_url = team_ids = allowed_organizations = tls_skip_verify_insecure = false tls_client_cert = tls_client_key = tls_client_ca = #################################### Basic Auth ########################## [auth.basic] enabled = true #################################### Auth Proxy ########################## [auth.proxy] enabled = false header_name = X-WEBAUTH-USER header_property = username auto_sign_up = true ldap_sync_ttl = 60 whitelist = headers = #################################### Auth LDAP ########################### [auth.ldap] enabled = false config_file = /etc/grafana/ldap.toml allow_sign_up = true #################################### SMTP / Emailing ##################### [smtp] enabled = false host = localhost:25 user = # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" password = cert_file = key_file = skip_verify = false from_address = admin@grafana.localhost from_name = Grafana ehlo_identity = [emails] welcome_email_on_sign_up = false templates_pattern = emails/*.html #################################### Logging ########################## [log] # Either "console", "file", "syslog". Default is console and file # Use space to separate multiple modes, e.g. "console file" mode = console file # Either "debug", "info", "warn", "error", "critical", default is "info" level = info # optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug filters = # For "console" mode only [log.console] level = # log line format, valid options are text, console and json format = console # For "file" mode only [log.file] level = # log line format, valid options are text, console and json format = text # This enables automated log rotate(switch of following options), default is true log_rotate = true # Max line number of single file, default is 1000000 max_lines = 1000000 # Max size shift of single file, default is 28 means 1 << 28, 256MB max_size_shift = 28 # Segment log daily, default is true daily_rotate = true # Expired days of log file(delete after max days), default is 7 max_days = 7 [log.syslog] level = # log line format, valid options are text, console and json format = text # Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used. network = address = # Syslog facility. user, daemon and local0 through local7 are valid. facility = # Syslog tag. By default, the process' argv[0] is used. tag = #################################### Usage Quotas ######################## [quota] enabled = false #### set quotas to -1 to make unlimited. #### # limit number of users per Org. org_user = 10 # limit number of dashboards per Org. org_dashboard = 100 # limit number of data_sources per Org. org_data_source = 10 # limit number of api_keys per Org. org_api_key = 10 # limit number of orgs a user can create. user_org = 10 # Global limit of users. global_user = -1 # global limit of orgs. global_org = -1 # global limit of dashboards global_dashboard = -1 # global limit of api_keys global_api_key = -1 # global limit on number of logged in users. global_session = -1 #################################### Alerting ############################ [alerting] # Disable alerting engine & UI features enabled = true # Makes it possible to turn off alert rule execution but alerting UI is visible execute_alerts = true # Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state) error_or_timeout = alerting # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok) nodata_or_nullvalues = no_data # Alert notifications can include images, but rendering many images at the same time can overload the server # This limit will protect the server from render overloading and make sure notifications are sent out quickly concurrent_render_limit = 5 #################################### Explore ############################# [explore] # Enable the Explore section enabled = false #################################### Internal Grafana Metrics ############ # Metrics available at HTTP API Url /metrics [metrics] enabled = true interval_seconds = 10 # Send internal Grafana metrics to graphite [metrics.graphite] # Enable by setting the address setting (ex localhost:2003) address = prefix = prod.grafana.%(instance_name)s. [grafana_net] url = https://grafana.com [grafana_com] url = https://grafana.com #################################### Distributed tracing ############ [tracing.jaeger] # jaeger destination (ex localhost:6831) address = # tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2) always_included_tag = # Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote sampler_type = const # jaeger samplerconfig param # for "const" sampler, 0 or 1 for always false/true respectively # for "probabilistic" sampler, a probability between 0 and 1 # for "rateLimiting" sampler, the number of spans per second # for "remote" sampler, param is the same as for "probabilistic" # and indicates the initial sampling rate before the actual one # is received from the mothership sampler_param = 1 #################################### External Image Storage ############## [external_image_storage] # You can choose between (s3, webdav, gcs, azure_blob, local) provider = [external_image_storage.s3] bucket_url = bucket = region = path = access_key = secret_key = [external_image_storage.webdav] url = username = password = public_url = [external_image_storage.gcs] key_file = bucket = path = [external_image_storage.azure_blob] account_name = account_key = container_name = [external_image_storage.local] # does not require any configuration [rendering] # Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer server_url = callback_url =
" + }, + "provisioning": { + "description": "Provisioning properties to be used", + "type": "object", + "properties": { + "datasources": { + "description": "Base64 encoded conf/provisioning/datasources/datasources.yml", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "" + }, + "dashboards": { + "description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "" + } + } + } + }, + "required": [ + "cpus", + "mem" + ] + } + } +} diff --git a/repo/packages/G/grafana/7/marathon.json.mustache b/repo/packages/G/grafana/7/marathon.json.mustache new file mode 100644 index 000000000..ef8d86568 --- /dev/null +++ b/repo/packages/G/grafana/7/marathon.json.mustache @@ -0,0 +1,96 @@ + +{ + "id": "{{service.name}}", + "cpus": 1.0, + "mem": 1024, + "instances": 1, + "user": "{{service.user}}", + "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH; export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so); export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/jre/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms256M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./operator-scheduler/bin/operator svc.yml", + "labels": { + "DCOS_COMMONS_API_VERSION": "v1", + "DCOS_COMMONS_UNINSTALL": "true", + "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}", + "MARATHON_SINGLE_INSTANCE_APP": "true", + "DCOS_SERVICE_NAME": "{{service.name}}", + "DCOS_SERVICE_PORT_INDEX": "0", + "DCOS_SERVICE_SCHEME": "http" + }, + {{#service.service_account_secret}} + "secrets": { + "serviceCredential": { + "source": "{{service.service_account_secret}}" + } + }, + {{/service.service_account_secret}} + "env": { + "PACKAGE_NAME": "{{package-name}}", + "PACKAGE_VERSION": "{{package-version}}", + "PACKAGE_BUILD_TIME_EPOCH_MS": "1531343768523", + "PACKAGE_BUILD_TIME_STR": "2018-07-11T21:16:08.523025", + "FRAMEWORK_NAME": "{{service.name}}", + "FRAMEWORK_USER": "{{service.user}}", + "FRAMEWORK_PRINCIPAL": "{{service.service_account}}", + "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", + "MESOS_API_VERSION": "{{service.mesos_api_version}}", + + "GRAFANA_DIR": "{{grafana.dir}}", + "GRAFANA_CPUS": "{{grafana.cpus}}", + "GRAFANA_MEM": "{{grafana.mem}}", + "GRAFANA_VOLUME": "{{grafana.volume.path}}", + "GRAFANA_VOLUME_TYPE": "{{grafana.volume.type}}", + "GRAFANA_VOLUME_SIZE": "{{grafana.volume.size}}", + "GRAFANA_INI": "{{grafana.ini}}", + "GRAFANA_DSP": "{{grafana.provisioning.datasources}}", + "GRAFANA_DBP": "{{grafana.provisioning.dashboards}}", + + "NODE_COUNT": "{{node.count}}", + "NODE_PLACEMENT": "{{{node.placement_constraint}}}", + + "NODE_CPUS": "{{node.cpus}}", + "NODE_MEM": "{{node.mem}}", + "NODE_DISK": "{{node.disk}}", + "NODE_DISK_TYPE": "{{node.disk_type}}", + + "JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}", + "EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}", + "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", + "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", + {{#service.service_account_secret}} + "DCOS_SERVICE_ACCOUNT_CREDENTIAL": { "secret": "serviceCredential" }, + "MESOS_MODULES": "{"libraries":[{"file":"libmesos-bundle\/lib\/mesos\/libdcos_security.so","modules":[{"name": "com_mesosphere_dcos_ClassicRPCAuthenticatee"},{"name":"com_mesosphere_dcos_http_Authenticatee","parameters":[{"key":"jwt_exp_timeout","value":"5mins"},{"key":"preemptive_refresh_duration","value":"30mins"}]}]}]}", + "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", + "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", + {{/service.service_account_secret}} + "LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}" + }, + "uris": [ + "{{resource.assets.uris.bootstrap-zip}}", + "{{resource.assets.uris.jre-tar-gz}}", + "{{resource.assets.uris.scheduler-zip}}", + "{{resource.assets.uris.libmesos-bundle-tar-gz}}", + "{{resource.assets.uris.svc}}" + ], + "upgradeStrategy":{ + "minimumHealthCapacity": 0, + "maximumOverCapacity": 0 + }, + "healthChecks": [ + { + "protocol": "MESOS_HTTP", + "path": "/v1/health", + "gracePeriodSeconds": 900, + "intervalSeconds": 30, + "portIndex": 0, + "timeoutSeconds": 30, + "maxConsecutiveFailures": 0 + } + ], + "portDefinitions": [ + { + "port": 0, + "protocol": "tcp", + "name": "api", + "labels": { "VIP_0": "/api.{{service.name}}:80" } + } + ] +} diff --git a/repo/packages/G/grafana/7/package.json b/repo/packages/G/grafana/7/package.json new file mode 100644 index 000000000..87689f15f --- /dev/null +++ b/repo/packages/G/grafana/7/package.json @@ -0,0 +1,23 @@ +{ + "packagingVersion": "4.0", + "upgradesFrom": [ + "*" + ], + "downgradesTo": [ + "*" + ], + "minDcosReleaseVersion": "1.10", + "name": "grafana", + "version": "5.5.0-5.3.4", + "maintainer": "https://dcos.io/community", + "description": "Grafana on DC/OS", + "selected": false, + "framework": true, + "tags": [ + "grafana", + "monitoring", + "visualization" + ], + "postInstallNotes": "DC/OS Grafana is being installed!", + "postUninstallNotes": "DC/OS Grafana is being uninstalled." +} diff --git a/repo/packages/G/grafana/7/resource.json b/repo/packages/G/grafana/7/resource.json new file mode 100644 index 000000000..480f5adb0 --- /dev/null +++ b/repo/packages/G/grafana/7/resource.json @@ -0,0 +1,62 @@ +{ + "assets": { + "uris": { + "jre-tar-gz": "https://downloads.mesosphere.com/java/server-jre-8u162-linux-x64.tar.gz", + "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.11.0.tar.gz", + "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", + "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", + "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", + "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/svc.yml", + "grafana-tar-gz": "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.3.4.linux-amd64.tar.gz" + } + }, + "images": { + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", + "screenshots": [ + "https://prometheus.io/assets/grafana_prometheus-cbb943f0bb3.png", + "https://grafana.com/blog/img/docs/v45/query_inspector.png" + ] + }, + "cli": { + "binaries": { + "darwin": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin" + } + }, + "linux": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux" + } + }, + "windows": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe" + } + } + } + } +} From 22a8f5f9dbe43247688ae7edbfbe83b3af1de4bf Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 3 Dec 2018 20:14:20 +0000 Subject: [PATCH 02/13] pare-down config.json base64 configuration files. move svc.yml. --- repo/packages/G/grafana/7/config.json | 14 +++++++------- repo/packages/G/grafana/7/resource.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/repo/packages/G/grafana/7/config.json b/repo/packages/G/grafana/7/config.json index 538ad0c0e..f3dc6eb62 100644 --- a/repo/packages/G/grafana/7/config.json +++ b/repo/packages/G/grafana/7/config.json @@ -14,7 +14,7 @@ "user": { "description": "The user that the service will run as.", "type": "string", - "default": "root", + "default": "nobody", "title": "User" }, "service_account": { @@ -70,7 +70,7 @@ "mem": { "description": "Grafana pod mem requirements (in MB)", "type": "integer", - "default": 1024 + "default": 2048 }, "volume": { "description": "Grafana volume requirements", @@ -79,7 +79,7 @@ "path": { "description": "Location of persistent volume to store data", "type": "string", - "default": "/tmp" + "default": "grafana-data" }, "type": { "description": "The type of persistent volume to use, one of ROOT or MOUNT", @@ -99,13 +99,13 @@ } }, "ini": { - "description": "Base64 encoded grafana.ini", + "description": "Base64 encoded conf/grafana.ini", "type": "string", "media": { "binaryEncoding": "base64", "type": "application/x-yaml" }, - "default": "##################### Grafana Configuration Defaults ##################### # # Do not modify this file in grafana installs # # possible values : production, development app_mode = production # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty instance_name = ${HOSTNAME} #################################### Paths ############################### [paths] # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) data = data # Temporary files in `data` directory older than given duration will be removed temp_data_lifetime = 24h # Directory where grafana can store logs logs = data/log # Directory where grafana will automatically scan and look for plugins plugins = data/plugins # folder that contains provisioning config files that grafana will apply on startup and while running. provisioning = conf/provisioning #################################### Server ############################## [server] # Protocol (http, https, socket) protocol = http # The ip address to bind to, empty will bind to all interfaces http_addr = # The http port to use http_port = 3000 # The public facing domain name used to access grafana from a browser domain = localhost # Redirect to correct domain if host header does not match domain # Prevents DNS rebinding attacks enforce_domain = false # The full public facing url root_url = %(protocol)s://%(domain)s:%(http_port)s/ # Log web requests router_logging = false # the path relative working path static_root_path = public # enable gzip enable_gzip = false # https certs & key file cert_file = cert_key = # Unix socket path socket = /tmp/grafana.sock #################################### Database ############################ [database] # You can configure the database connection by specifying type, host, name, user and password # as separate properties or as on string using the url property. # Either "mysql", "postgres" or "sqlite3", it's your choice type = sqlite3 host = 127.0.0.1:3306 name = grafana user = root # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" password = # Use either URL or the previous fields to configure the database # Example: mysql://user:secret@host:port/database url = # Max idle conn setting default is 2 max_idle_conn = 2 # Max conn setting default is 0 (mean not set) max_open_conn = # Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) conn_max_lifetime = 14400 # Set to true to log the sql calls and execution times. log_queries = # For "postgres", use either "disable", "require" or "verify-full" # For "mysql", use either "true", "false", or "skip-verify". ssl_mode = disable ca_cert_path = client_key_path = client_cert_path = server_cert_name = # For "sqlite3" only, path relative to data_path setting path = grafana.db #################################### Session ############################# [session] # Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file" provider = file # Provider config options # memory: not have any config yet # file: session dir path, is relative to grafana data_path # redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana` # postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable # mysql: go-sql-driver/mysql dsn config string, examples: # `user:password@tcp(127.0.0.1:3306)/database_name` # `user:password@unix(/var/run/mysqld/mysqld.sock)/database_name` # memcache: 127.0.0.1:11211 provider_config = sessions # Session cookie name cookie_name = grafana_sess # If you use session in https only, default is false cookie_secure = false # Session life time, default is 86400 session_life_time = 86400 gc_interval_time = 86400 # Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) conn_max_lifetime = 14400 #################################### Data proxy ########################### [dataproxy] # This enables data proxy logging, default is false logging = false #################################### Analytics ########################### [analytics] # Server reporting, sends usage counters to stats.grafana.org every 24 hours. # No ip addresses are being tracked, only simple counters to track # running instances, dashboard and error counts. It is very helpful to us. # Change this option to false to disable reporting. reporting_enabled = true # Set to false to disable all checks to https://grafana.com # for new versions (grafana itself and plugins), check is used # in some UI views to notify that grafana or plugin update exists # This option does not cause any auto updates, nor send any information # only a GET request to https://grafana.com to get latest versions check_for_updates = true # Google Analytics universal tracking code, only enabled if you specify an id here google_analytics_ua_id = # Google Tag Manager ID, only enabled if you specify an id here google_tag_manager_id = #################################### Security ############################ [security] # default admin user, created on startup admin_user = admin # default admin password, can be changed before first start of grafana, or in profile settings admin_password = admin # used for signing secret_key = SW2YcwTIb9zpOOhoPsMm # Auto-login remember days login_remember_days = 7 cookie_username = grafana_user cookie_remember_name = grafana_remember # disable gravatar profile images disable_gravatar = false # data source proxy whitelist (ip_or_domain:port separated by spaces) data_source_proxy_whitelist = # disable protection against brute force login attempts disable_brute_force_login_protection = false #################################### Snapshots ########################### [snapshots] # snapshot sharing options external_enabled = true external_snapshot_url = https://snapshots-origin.raintank.io external_snapshot_name = Publish to snapshot.raintank.io # remove expired snapshot snapshot_remove_expired = true #################################### Dashboards ################## [dashboards] # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1 versions_to_keep = 20 #################################### Users ############################### [users] # disable user signup / registration allow_sign_up = false # Allow non admin users to create organizations allow_org_create = false # Set to true to automatically assign new users to the default organization (id 1) auto_assign_org = true # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true) auto_assign_org_id = 1 # Default role new users will be automatically assigned (if auto_assign_org above is set to true) auto_assign_org_role = Viewer # Require email validation before sign up completes verify_email_enabled = false # Background text for the user field on the login page login_hint = email or username # Default UI theme ("dark" or "light") default_theme = dark # External user management external_manage_link_url = external_manage_link_name = external_manage_info = # Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard. viewers_can_edit = false [auth] # Set to true to disable (hide) the login form, useful if you use OAuth disable_login_form = false # Set to true to disable the signout link in the side menu. useful if you use auth.proxy disable_signout_menu = false # URL to redirect the user to after sign out signout_redirect_url = #################################### Anonymous Auth ###################### [auth.anonymous] # enable anonymous access enabled = false # specify organization name that should be used for unauthenticated users org_name = Main Org. # specify role for unauthenticated users org_role = Viewer #################################### Github Auth ######################### [auth.github] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email,read:org auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user team_ids = allowed_organizations = #################################### GitLab Auth ######################### [auth.gitlab] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = api auth_url = https://gitlab.com/oauth/authorize token_url = https://gitlab.com/oauth/token api_url = https://gitlab.com/api/v4 allowed_groups = #################################### Google Auth ######################### [auth.google] enabled = false allow_sign_up = true client_id = some_client_id client_secret = some_client_secret scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email auth_url = https://accounts.google.com/o/oauth2/auth token_url = https://accounts.google.com/o/oauth2/token api_url = https://www.googleapis.com/oauth2/v1/userinfo allowed_domains = hosted_domain = #################################### Grafana.com Auth #################### # legacy key names (so they work in env variables) [auth.grafananet] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email allowed_organizations = [auth.grafana_com] enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email allowed_organizations = #################################### Generic OAuth ####################### [auth.generic_oauth] name = OAuth enabled = false allow_sign_up = true client_id = some_id client_secret = some_secret scopes = user:email email_attribute_name = email:primary auth_url = token_url = api_url = team_ids = allowed_organizations = tls_skip_verify_insecure = false tls_client_cert = tls_client_key = tls_client_ca = #################################### Basic Auth ########################## [auth.basic] enabled = true #################################### Auth Proxy ########################## [auth.proxy] enabled = false header_name = X-WEBAUTH-USER header_property = username auto_sign_up = true ldap_sync_ttl = 60 whitelist = headers = #################################### Auth LDAP ########################### [auth.ldap] enabled = false config_file = /etc/grafana/ldap.toml allow_sign_up = true #################################### SMTP / Emailing ##################### [smtp] enabled = false host = localhost:25 user = # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" password = cert_file = key_file = skip_verify = false from_address = admin@grafana.localhost from_name = Grafana ehlo_identity = [emails] welcome_email_on_sign_up = false templates_pattern = emails/*.html #################################### Logging ########################## [log] # Either "console", "file", "syslog". Default is console and file # Use space to separate multiple modes, e.g. "console file" mode = console file # Either "debug", "info", "warn", "error", "critical", default is "info" level = info # optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug filters = # For "console" mode only [log.console] level = # log line format, valid options are text, console and json format = console # For "file" mode only [log.file] level = # log line format, valid options are text, console and json format = text # This enables automated log rotate(switch of following options), default is true log_rotate = true # Max line number of single file, default is 1000000 max_lines = 1000000 # Max size shift of single file, default is 28 means 1 << 28, 256MB max_size_shift = 28 # Segment log daily, default is true daily_rotate = true # Expired days of log file(delete after max days), default is 7 max_days = 7 [log.syslog] level = # log line format, valid options are text, console and json format = text # Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used. network = address = # Syslog facility. user, daemon and local0 through local7 are valid. facility = # Syslog tag. By default, the process' argv[0] is used. tag = #################################### Usage Quotas ######################## [quota] enabled = false #### set quotas to -1 to make unlimited. #### # limit number of users per Org. org_user = 10 # limit number of dashboards per Org. org_dashboard = 100 # limit number of data_sources per Org. org_data_source = 10 # limit number of api_keys per Org. org_api_key = 10 # limit number of orgs a user can create. user_org = 10 # Global limit of users. global_user = -1 # global limit of orgs. global_org = -1 # global limit of dashboards global_dashboard = -1 # global limit of api_keys global_api_key = -1 # global limit on number of logged in users. global_session = -1 #################################### Alerting ############################ [alerting] # Disable alerting engine & UI features enabled = true # Makes it possible to turn off alert rule execution but alerting UI is visible execute_alerts = true # Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state) error_or_timeout = alerting # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok) nodata_or_nullvalues = no_data # Alert notifications can include images, but rendering many images at the same time can overload the server # This limit will protect the server from render overloading and make sure notifications are sent out quickly concurrent_render_limit = 5 #################################### Explore ############################# [explore] # Enable the Explore section enabled = false #################################### Internal Grafana Metrics ############ # Metrics available at HTTP API Url /metrics [metrics] enabled = true interval_seconds = 10 # Send internal Grafana metrics to graphite [metrics.graphite] # Enable by setting the address setting (ex localhost:2003) address = prefix = prod.grafana.%(instance_name)s. [grafana_net] url = https://grafana.com [grafana_com] url = https://grafana.com #################################### Distributed tracing ############ [tracing.jaeger] # jaeger destination (ex localhost:6831) address = # tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2) always_included_tag = # Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote sampler_type = const # jaeger samplerconfig param # for "const" sampler, 0 or 1 for always false/true respectively # for "probabilistic" sampler, a probability between 0 and 1 # for "rateLimiting" sampler, the number of spans per second # for "remote" sampler, param is the same as for "probabilistic" # and indicates the initial sampling rate before the actual one # is received from the mothership sampler_param = 1 #################################### External Image Storage ############## [external_image_storage] # You can choose between (s3, webdav, gcs, azure_blob, local) provider = [external_image_storage.s3] bucket_url = bucket = region = path = access_key = secret_key = [external_image_storage.webdav] url = username = password = public_url = [external_image_storage.gcs] key_file = bucket = path = [external_image_storage.azure_blob] account_name = account_key = container_name = [external_image_storage.local] # does not require any configuration [rendering] # Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer server_url = callback_url =
" + "default": "YXBwX21vZGUgPSBwcm9kdWN0aW9uCmluc3RhbmNlX25hbWUgPSAke0hPU1ROQU1FfQpbcGF0aHNdCmRhdGEgPSAvZ3JhZmFuYS1kYXRhCjt0ZW1wX2RhdGFfbGlmZXRpbWUgPSAyNGgKbG9ncyA9IC9ncmFmYW5hLWRhdGEKcGx1Z2lucyA9IC9ncmFmYW5hLWRhdGEvcGx1Z2lucwpwcm92aXNpb25pbmcgPSBjb25mL3Byb3Zpc2lvbmluZwoK" }, "provisioning": { "description": "Provisioning properties to be used", @@ -118,7 +118,7 @@ "binaryEncoding": "base64", "type": "application/x-yaml" }, - "default": "" + "default": "YXBpVmVyc2lvbjogMQoKI2RlbGV0ZURhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICBvcmdJZDogMQoKI2RhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICB0eXBlOiBwcm9tZXRoZXVzCiMgICAgYWNjZXNzOiBwcm94eQojICAgIG9yZ0lkOiAxCiMgICAgdXJsOiBodHRwOi8vcHJvbWV0aGV1cy5wcm9tZXRoZXVzLmw0bGIudGhpc2Rjb3MuZGlyZWN0b3J5OjkwOTAKIyAgICBpc0RlZmF1bHQ6IHRydWUKIyAgICBqc29uRGF0YTogeyAidGltZUludGVydmFsIjogIjMwcyIgfQo" }, "dashboards": { "description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config", @@ -127,7 +127,7 @@ "binaryEncoding": "base64", "type": "application/x-yaml" }, - "default": "" + "default": "YXBpVmVyc2lvbjogMQoK" } } } diff --git a/repo/packages/G/grafana/7/resource.json b/repo/packages/G/grafana/7/resource.json index 480f5adb0..25f4b79c5 100644 --- a/repo/packages/G/grafana/7/resource.json +++ b/repo/packages/G/grafana/7/resource.json @@ -6,7 +6,7 @@ "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", - "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/svc.yml", + "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/7/svc.yml", "grafana-tar-gz": "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.3.4.linux-amd64.tar.gz" } }, From 7a0540c809b56a24217dcbd08a04a15d16dc3aa7 Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 3 Dec 2018 20:25:01 +0000 Subject: [PATCH 03/13] add PATH type to volume options --- repo/packages/G/grafana/7/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repo/packages/G/grafana/7/config.json b/repo/packages/G/grafana/7/config.json index f3dc6eb62..178950004 100644 --- a/repo/packages/G/grafana/7/config.json +++ b/repo/packages/G/grafana/7/config.json @@ -87,7 +87,8 @@ "default": "ROOT", "enum": [ "ROOT", - "MOUNT" + "MOUNT", + "PATH" ] }, "size": { From 0a41e8905bcd8671e89ae8cdb56db9babb3ea29a Mon Sep 17 00:00:00 2001 From: cbaker Date: Tue, 4 Dec 2018 17:56:11 +0000 Subject: [PATCH 04/13] Make root default user so volume can be created --- repo/packages/G/grafana/7/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/packages/G/grafana/7/config.json b/repo/packages/G/grafana/7/config.json index 178950004..bfb5c7abf 100644 --- a/repo/packages/G/grafana/7/config.json +++ b/repo/packages/G/grafana/7/config.json @@ -14,7 +14,7 @@ "user": { "description": "The user that the service will run as.", "type": "string", - "default": "nobody", + "default": "root", "title": "User" }, "service_account": { From b120ecc47d1983ef11e2ff0040729376b7076632 Mon Sep 17 00:00:00 2001 From: cbaker Date: Tue, 4 Dec 2018 20:24:21 +0000 Subject: [PATCH 05/13] Fix minDcosReleaseVersion, remove unnecessary env var. --- repo/packages/G/grafana/7/marathon.json.mustache | 1 - repo/packages/G/grafana/7/package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/repo/packages/G/grafana/7/marathon.json.mustache b/repo/packages/G/grafana/7/marathon.json.mustache index ef8d86568..ced43d4ad 100644 --- a/repo/packages/G/grafana/7/marathon.json.mustache +++ b/repo/packages/G/grafana/7/marathon.json.mustache @@ -33,7 +33,6 @@ "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", "MESOS_API_VERSION": "{{service.mesos_api_version}}", - "GRAFANA_DIR": "{{grafana.dir}}", "GRAFANA_CPUS": "{{grafana.cpus}}", "GRAFANA_MEM": "{{grafana.mem}}", "GRAFANA_VOLUME": "{{grafana.volume.path}}", diff --git a/repo/packages/G/grafana/7/package.json b/repo/packages/G/grafana/7/package.json index 87689f15f..c3d8dfa8e 100644 --- a/repo/packages/G/grafana/7/package.json +++ b/repo/packages/G/grafana/7/package.json @@ -6,7 +6,7 @@ "downgradesTo": [ "*" ], - "minDcosReleaseVersion": "1.10", + "minDcosReleaseVersion": "1.11", "name": "grafana", "version": "5.5.0-5.3.4", "maintainer": "https://dcos.io/community", From ebc428115e2d9f98f9e8e5ece7f671561d85efd3 Mon Sep 17 00:00:00 2001 From: cbaker Date: Tue, 4 Dec 2018 23:15:10 +0000 Subject: [PATCH 06/13] Fix broken screenshot url. --- repo/packages/G/grafana/7/resource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/packages/G/grafana/7/resource.json b/repo/packages/G/grafana/7/resource.json index 25f4b79c5..d960b22ab 100644 --- a/repo/packages/G/grafana/7/resource.json +++ b/repo/packages/G/grafana/7/resource.json @@ -15,7 +15,7 @@ "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", "screenshots": [ - "https://prometheus.io/assets/grafana_prometheus-cbb943f0bb3.png", + "https://prometheus.io/assets/grafana_prometheus.png", "https://grafana.com/blog/img/docs/v45/query_inspector.png" ] }, From c6c8081c26c570b369d630b3518890e625bfe6a9 Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 7 Jan 2019 16:17:00 +0000 Subject: [PATCH 07/13] changes requested by @vishnu2kmohan for pull/2098 --- .../G/grafana/7/marathon.json.mustache | 31 ++++++++----- repo/packages/G/grafana/7/resource.json | 44 +++++++++---------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/repo/packages/G/grafana/7/marathon.json.mustache b/repo/packages/G/grafana/7/marathon.json.mustache index ced43d4ad..87cb33be8 100644 --- a/repo/packages/G/grafana/7/marathon.json.mustache +++ b/repo/packages/G/grafana/7/marathon.json.mustache @@ -15,13 +15,22 @@ "DCOS_SERVICE_PORT_INDEX": "0", "DCOS_SERVICE_SCHEME": "http" }, - {{#service.service_account_secret}} + {{#security.secret-name}} + "container": { + "type": "MESOS", + "volumes":[ + { + "containerPath": "secrets/service-account.json", + "secret": "serviceCredential" + } + ] + }, "secrets": { - "serviceCredential": { - "source": "{{service.service_account_secret}}" - } + "serviceCredential": { + "source": "{{security.secret-name}}" + } }, - {{/service.service_account_secret}} + {{/security.secret-name}} "env": { "PACKAGE_NAME": "{{package-name}}", "PACKAGE_VERSION": "{{package-version}}", @@ -54,12 +63,12 @@ "EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}", "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", - {{#service.service_account_secret}} - "DCOS_SERVICE_ACCOUNT_CREDENTIAL": { "secret": "serviceCredential" }, - "MESOS_MODULES": "{"libraries":[{"file":"libmesos-bundle\/lib\/mesos\/libdcos_security.so","modules":[{"name": "com_mesosphere_dcos_ClassicRPCAuthenticatee"},{"name":"com_mesosphere_dcos_http_Authenticatee","parameters":[{"key":"jwt_exp_timeout","value":"5mins"},{"key":"preemptive_refresh_duration","value":"30mins"}]}]}]}", - "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", - "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", - {{/service.service_account_secret}} + {{#security.secret-name}} + "DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json", + "MESOS_MODULES": "{\"libraries\":[{\"file\":\"libmesos-bundle\/lib\/mesos\/libdcos_security.so\",\"modules\":[{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"},{\"name\":\"com_mesosphere_dcos_http_Authenticatee\",\"parameters\":[{\"key\":\"jwt_exp_timeout\",\"value\":\"5mins\"},{\"key\":\"preemptive_refresh_duration\",\"value\":\"30mins\"}]}]}]}", + "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", + "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", + {{/security.secret-name}} "LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}" }, "uris": [ diff --git a/repo/packages/G/grafana/7/resource.json b/repo/packages/G/grafana/7/resource.json index d960b22ab..920c910b0 100644 --- a/repo/packages/G/grafana/7/resource.json +++ b/repo/packages/G/grafana/7/resource.json @@ -1,59 +1,59 @@ { "assets": { "uris": { - "jre-tar-gz": "https://downloads.mesosphere.com/java/server-jre-8u162-linux-x64.tar.gz", - "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.11.0.tar.gz", - "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", - "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", - "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", - "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/7/svc.yml", + "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", + "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", + "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", + "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", + "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/7/svc.yml", "grafana-tar-gz": "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.3.4.linux-amd64.tar.gz" } }, "images": { - "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", - "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", - "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", "screenshots": [ - "https://prometheus.io/assets/grafana_prometheus.png", + "https://prometheus.io/assets/grafana_prometheus.png", "https://grafana.com/blog/img/docs/v45/query_inspector.png" ] - }, + }, "cli": { "binaries": { "darwin": { "x86-64": { "contentHash": [ { - "algo": "sha256", + "algo": "sha256", "value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432" } - ], - "kind": "executable", + ], + "kind": "executable", "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin" } - }, + }, "linux": { "x86-64": { "contentHash": [ { - "algo": "sha256", + "algo": "sha256", "value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339" } - ], - "kind": "executable", + ], + "kind": "executable", "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux" } - }, + }, "windows": { "x86-64": { "contentHash": [ { - "algo": "sha256", + "algo": "sha256", "value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714" } - ], - "kind": "executable", + ], + "kind": "executable", "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe" } } From c54fc4407d7341aa2bff7ecf25a6ca1a5aa4d51b Mon Sep 17 00:00:00 2001 From: Radu Molnar Date: Thu, 4 Apr 2019 14:08:48 +0000 Subject: [PATCH 08/13] Added env variables for Graphite --- repo/packages/I/influxdb/2/config.json | 131 ++++++++++++++++++ .../I/influxdb/2/marathon.json.mustache | 78 +++++++++++ repo/packages/I/influxdb/2/package.json | 20 +++ repo/packages/I/influxdb/2/resource.json | 17 +++ 4 files changed, 246 insertions(+) create mode 100644 repo/packages/I/influxdb/2/config.json create mode 100644 repo/packages/I/influxdb/2/marathon.json.mustache create mode 100644 repo/packages/I/influxdb/2/package.json create mode 100644 repo/packages/I/influxdb/2/resource.json diff --git a/repo/packages/I/influxdb/2/config.json b/repo/packages/I/influxdb/2/config.json new file mode 100644 index 000000000..5b6bdf47e --- /dev/null +++ b/repo/packages/I/influxdb/2/config.json @@ -0,0 +1,131 @@ +{ + "properties": { + "service": { + "type": "object", + "description": "DC/OS service configuration properties", + "properties": { + "name": { + "description": "Name of this service instance", + "type": "string", + "default": "influxdb" + }, + "cpus": { + "description": "CPU shares to allocate to each service instance.", + "type": "number", + "default": 0.1, + "minimum": 0.1 + }, + "mem": { + "description": "Memory to allocate to each service instance.", + "type": "number", + "default": 2048.0, + "minimum": 1024.0 + } + }, + "required": [ + "cpus", + "mem" + ] + }, + "storage": { + "type": "object", + "description": "influxdb storage configuration properties", + "properties":{ + "host_volume_influxdb": { + "description": "If using non-persistent volumes (local volumes), this sets the location of a volume on the host to be used for the influxdb service to store the contents of the influxdb. The final location will be derived from this value plus the name set in `name` (e.g. `/mnt/host_volume/service_name`). This can be a mounted NFS drive. Note that this path must be the same on all DC/OS agents. NOTE: if you don't change the default /tmp value, YOUR DATA WILL NOT BE SAVED IN ANY WAY.", + "type": "string", + "default": "/tmp" + }, + "persistence": { + "type": "object", + "description": "Enable persistent storage.", + "properties": { + "enable": { + "description": "Enable or disable persistent storage.", + "type": "boolean", + "default": false + }, + "volume_mode_influxdb": { + "description": "Choose your mode: RW, R -> default RW.", + "type": "string", + "default": "RW" + } + } + } + } + }, + "networking": { + "type": "object", + "description": "influxdb networking configuration properties", + "properties": { + "port_api": { + "description": "Port number to be used for api communication internally to the cluster.", + "type": "number", + "default": 8086 + }, + "port_graphite": { + "description": "Port number to be used for Graphite input.", + "type": "number", + "default": 2003 + }, + "external_access": { + "type": "object", + "description": "Enable access from outside the cluster through Marathon-LB.\nNOTE: this connection is unencrypted.", + "properties": { + "enable": { + "description": "Enable or disable creating a VIP for external access through a public node running Marathon-LB.", + "type": "boolean", + "default": false + }, + "external_public_agent_ip": { + "description": "For external access, dns to be used for Marathon-LB vHost: For example use your public slave elb dns.", + "type": "string", + "default": "" + }, + "external_access_port": { + "description": "For external access, port number to be used for clear communication in the external Marathon-LB load balancer", + "type": "number", + "default": 18086 + } + } + } + } + }, + "configuration": { + "type": "object", + "description": "influxdb networking configuration properties", + "properties": { + "INFLUXDB_RETENTION_ENABLED": { + "description": "Set to false to prevent InfluxDB from enforcing retention policies.", + "type": "boolean", + "default": true + }, + "INFLUXDB_RETENTION_CHECK_INTERVAL": { + "description": "The rate at which InfluxDB checks to enforce a retention policy.", + "type": "string", + "default": "30m0s" + }, + "INFLUXDB_MONITOR_STORE_DATABASE": { + "description": "The destination database for recorded statistics.", + "type": "string", + "default": "_internal" + }, + "INFLUXDB_GRAPHITE_0_ENABLED": { + "description": "Set to true to enable Graphite input.", + "type": "boolean", + "default": false + }, + "INFLUXDB_GRAPHITE_0_DATABASE": { + "description": "The name of the Graphite database that you want to write to.", + "type": "string", + "default": "graphite" + }, + "INFLUXDB_GRAPHITE_0_TEMPLATES": { + "description": "The name of the Graphite database that you want to write to.", + "type": "string", + "default": "graphite.measurement*" + } + } + } + } +} diff --git a/repo/packages/I/influxdb/2/marathon.json.mustache b/repo/packages/I/influxdb/2/marathon.json.mustache new file mode 100644 index 000000000..60d8dedcf --- /dev/null +++ b/repo/packages/I/influxdb/2/marathon.json.mustache @@ -0,0 +1,78 @@ +{ + "id": "{{service.name}}", + "cpus": {{service.cpus}}, + "mem": {{service.mem}}, + "instances": 1, + "env": { + "INFLUXDB_RETENTION_ENABLED": "{{configuration.INFLUXDB_RETENTION_ENABLED}}", + "INFLUXDB_RETENTION_CHECK_INTERVAL": "{{configuration.INFLUXDB_RETENTION_CHECK_INTERVAL}}", + "INFLUXDB_MONITOR_STORE_DATABASE": "{{configuration.INFLUXDB_MONITOR_STORE_DATABASE}}", + "INFLUXDB_GRAPHITE_0_ENABLED": "{{configuration.INFLUXDB_GRAPHITE_0_ENABLED}}", + "INFLUXDB_GRAPHITE_0_DATABASE": "{{configuration.INFLUXDB_GRAPHITE_0_DATABASE}}", + "INFLUXDB_GRAPHITE_0_TEMPLATES": "{{configuration.INFLUXDB_GRAPHITE_0_TEMPLATES}}" + }, + "container": { + "type": "DOCKER", + {{#storage.persistence.enable}} + "volumes": [{ + "containerPath": "/var/lib/influxdb", + "hostPath": "{{storage.host_volume_influxdb}}/{{service.name}}", + "mode": "{{storage.persistence.volume_mode_influxdb}}" + } + ], + {{/storage.persistence.enable}} + "docker": { + "image": "{{resource.assets.container.docker.influxdb-docker}}", + "network": "BRIDGE", + "portMappings": [ + { + "containerPort": 8086, + "hostPort": 0, + {{#networking.external_access.enable}} + "servicePort": {{networking.external_access.external_access_port}}, + {{/networking.external_access.enable}} + "protocol": "tcp", + "name": "influxdb-api", + "labels": { + "VIP_0": "/{{service.name}}:{{networking.port_api}}" + } + }, + { + "containerPort": 2003, + "hostPort": 0, + "protocol": "tcp", + "name": "influxdb-graphite", + "labels": { + "VIP_0": "/{{service.name}}:{{networking.port_graphite}}" + } + } + ], + "forcePullImage": true + } + }, + "healthChecks": [ + { + "protocol": "HTTP", + "path": "/ping", + "gracePeriodSeconds": 300, + "intervalSeconds": 60, + "timeoutSeconds": 20, + "maxConsecutiveFailures": 3, + "ignoreHttp1xx": false + } + ], + "labels": { + "DCOS_PACKAGE_VERSION": "1.4", + "DCOS_SERVICE_NAME": "{{service.name}}", + "MARATHON_SINGLE_INSTANCE_APP": "true", + {{#networking.external_access.enable}} + "HAPROXY_GROUP": "external", + "HAPROXY_0_VHOST": "{{networking.external_access.external_public_agent_ip}}", + {{/networking.external_access.enable}} + "DCOS_PACKAGE_IS_FRAMEWORK": "false" + }, + "upgradeStrategy":{ + "minimumHealthCapacity": 0, + "maximumOverCapacity": 0 + } +} diff --git a/repo/packages/I/influxdb/2/package.json b/repo/packages/I/influxdb/2/package.json new file mode 100644 index 000000000..51ded58e6 --- /dev/null +++ b/repo/packages/I/influxdb/2/package.json @@ -0,0 +1,20 @@ +{ + "packagingVersion": "3.0", + "minDcosReleaseVersion": "1.7", + "name": "influxdb", + "version": "1.4-1", + "scm": "https://github.com/influxdata/influxdb", + "maintainer": "https://dcos.io/community", + "website": "https://github.com/influxdata/influxdb", + "description": "InfluxDB is an open-source time series database developed by InfluxData as part of their time series platform. It is written in Go and optimized for fast, high-availability storage and retrieval of time series data in fields such as operations monitoring, application metrics, Internet of Things sensor data, and real-time analytics.\n\nThis package can be used alongside the DC/OS 'cadvisor' and 'grafana' packages for a cluster-wide monitoring solution.\n\nInstallation Documentation: https://github.com/dcos/examples/tree/master/cadvisor-influxdb-grafana\n\nNote: Since InfluxDB 1.3.0 the admin-api is depcrecated and no longer used\n\nNote: You need to manually create your database, e.g. with Chronograf", + "tags": ["docker", "influxdb", "database", "monitoring"], + "preInstallNotes": "This DC/OS Service is currently in preview. There may be bugs, incomplete features, incorrect documentation, or other discrepancies.\n\nAdvanced Installation options notes\n\nstorage / persistence: create local persistent volumes for internal storage files to survive across restarts or failures. \n\nstorage / host_volume: if /tmp for example is used it will try to mount /tmp/influxdb (make sure the influxdb folder exists within your host_volum /tmp) if persistence is not selected, this package can use a local volume in the host for storage, like a local directory or an NFS mount. The parameter host_volume controls the path in the host in which these volumes will be created, which MUST be the same on all nodes of the cluster.\n\nNOTE: If you didn't select persistence in the storage section, or provided a valid value for host_volume on installation,\nYOUR DATA WILL NOT BE SAVED IN ANY WAY.\n\nnetworking / port: This DC/OS service can be accessed from any other application through a NAMED VIP in the format service_name.marathon.l4lb.thisdcos.directory:port. Check status of the VIP in the Network tab of the DC/OS Dashboard (Enterprise DC/OS only).\n\nnetworking / external_access: create an entry in Marathon-LB for accessing the service from outside of the cluster\n\nnetworking / external_access_port: port to be used in Marathon-LB for accessing the service. \n\nnetworking / external_public_agent_ip: dns for Marathon-LB, typically set to your public agents public ip.\n\n Access your InfluxDB Server e.g. from your laptop with Chronograf: docker run -p 8888:8888 chronograf --influxdb-url=http://", + "postInstallNotes": "Service installed.", + "postUninstallNotes": "Service uninstalled. Note that any persisting data still exists and will need to be manually removed from the agent where the service was deployed.", + "licenses": [ + { + "name": "Apache License", + "url": "http://en.wikipedia.org/wiki/Apache_License" + } + ] +} \ No newline at end of file diff --git a/repo/packages/I/influxdb/2/resource.json b/repo/packages/I/influxdb/2/resource.json new file mode 100644 index 000000000..393a5d1e5 --- /dev/null +++ b/repo/packages/I/influxdb/2/resource.json @@ -0,0 +1,17 @@ +{ + "images": { + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-large.png", + "screenshots": [ + "https://raw.githubusercontent.com/Kentik/docker-monitor/master/screenshots/influxdb-screenshot.png" + ] + }, + "assets": { + "container": { + "docker": { + "influxdb-docker": "influxdb:1.4" + } + } + } +} From 50bc93752df0298f977908ab9eb04dfbec15bf7a Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 7 Oct 2019 16:00:08 +0000 Subject: [PATCH 09/13] Upgrade Grafana to 6.4.1 --- repo/packages/G/grafana/8/config.json | 142 ++++++++++++++++++ .../G/grafana/8/marathon.json.mustache | 104 +++++++++++++ repo/packages/G/grafana/8/package.json | 23 +++ repo/packages/G/grafana/8/resource.json | 62 ++++++++ 4 files changed, 331 insertions(+) create mode 100644 repo/packages/G/grafana/8/config.json create mode 100644 repo/packages/G/grafana/8/marathon.json.mustache create mode 100644 repo/packages/G/grafana/8/package.json create mode 100644 repo/packages/G/grafana/8/resource.json diff --git a/repo/packages/G/grafana/8/config.json b/repo/packages/G/grafana/8/config.json new file mode 100644 index 000000000..bfb5c7abf --- /dev/null +++ b/repo/packages/G/grafana/8/config.json @@ -0,0 +1,142 @@ +{ + "type": "object", + "properties": { + "service": { + "type": "object", + "description": "DC/OS service configuration properties", + "properties": { + "name": { + "description": "The name of the service instance", + "type": "string", + "default": "grafana", + "title": "Service name" + }, + "user": { + "description": "The user that the service will run as.", + "type": "string", + "default": "root", + "title": "User" + }, + "service_account": { + "description": "The service account for DC/OS service authentication. This is typically left empty to use the default unless service authentication is needed. The value given here is passed as the principal of Mesos framework.", + "type": "string", + "default": "" + }, + "service_account_secret": { + "description": "Name of the Secret Store credentials to use for DC/OS service authentication. This should be left empty unless service authentication is needed.", + "type": "string", + "default": "", + "title": "Credential secret name (optional)" + }, + "mesos_api_version": { + "description": "Configures the Mesos API version to use. Possible values: V0 (non-HTTP), V1 (HTTP)", + "type": "string", + "enum": [ + "V0", + "V1" + ], + "default": "V1" + }, + "log_level": { + "description": "The log level for the DC/OS service.", + "type": "string", + "enum": [ + "OFF", + "FATAL", + "ERROR", + "WARN", + "INFO", + "DEBUG", + "TRACE", + "ALL" + ], + "default": "INFO" + } + }, + "required": [ + "name", + "user" + ] + }, + "grafana": { + "description": "grafana pod configuration properties", + "type": "object", + "properties": { + "cpus": { + "description": "Grafana pod CPU requirements", + "type": "number", + "default": 0.2 + }, + "mem": { + "description": "Grafana pod mem requirements (in MB)", + "type": "integer", + "default": 2048 + }, + "volume": { + "description": "Grafana volume requirements", + "type": "object", + "properties": { + "path": { + "description": "Location of persistent volume to store data", + "type": "string", + "default": "grafana-data" + }, + "type": { + "description": "The type of persistent volume to use, one of ROOT or MOUNT", + "type": "string", + "default": "ROOT", + "enum": [ + "ROOT", + "MOUNT", + "PATH" + ] + }, + "size": { + "description": "The size of the persistent volume in MB", + "type": "integer", + "default": 512, + "minimum": 512 + } + } + }, + "ini": { + "description": "Base64 encoded conf/grafana.ini", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBwX21vZGUgPSBwcm9kdWN0aW9uCmluc3RhbmNlX25hbWUgPSAke0hPU1ROQU1FfQpbcGF0aHNdCmRhdGEgPSAvZ3JhZmFuYS1kYXRhCjt0ZW1wX2RhdGFfbGlmZXRpbWUgPSAyNGgKbG9ncyA9IC9ncmFmYW5hLWRhdGEKcGx1Z2lucyA9IC9ncmFmYW5hLWRhdGEvcGx1Z2lucwpwcm92aXNpb25pbmcgPSBjb25mL3Byb3Zpc2lvbmluZwoK" + }, + "provisioning": { + "description": "Provisioning properties to be used", + "type": "object", + "properties": { + "datasources": { + "description": "Base64 encoded conf/provisioning/datasources/datasources.yml", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBpVmVyc2lvbjogMQoKI2RlbGV0ZURhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICBvcmdJZDogMQoKI2RhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICB0eXBlOiBwcm9tZXRoZXVzCiMgICAgYWNjZXNzOiBwcm94eQojICAgIG9yZ0lkOiAxCiMgICAgdXJsOiBodHRwOi8vcHJvbWV0aGV1cy5wcm9tZXRoZXVzLmw0bGIudGhpc2Rjb3MuZGlyZWN0b3J5OjkwOTAKIyAgICBpc0RlZmF1bHQ6IHRydWUKIyAgICBqc29uRGF0YTogeyAidGltZUludGVydmFsIjogIjMwcyIgfQo" + }, + "dashboards": { + "description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBpVmVyc2lvbjogMQoK" + } + } + } + }, + "required": [ + "cpus", + "mem" + ] + } + } +} diff --git a/repo/packages/G/grafana/8/marathon.json.mustache b/repo/packages/G/grafana/8/marathon.json.mustache new file mode 100644 index 000000000..87cb33be8 --- /dev/null +++ b/repo/packages/G/grafana/8/marathon.json.mustache @@ -0,0 +1,104 @@ + +{ + "id": "{{service.name}}", + "cpus": 1.0, + "mem": 1024, + "instances": 1, + "user": "{{service.user}}", + "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH; export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so); export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/jre/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms256M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./operator-scheduler/bin/operator svc.yml", + "labels": { + "DCOS_COMMONS_API_VERSION": "v1", + "DCOS_COMMONS_UNINSTALL": "true", + "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}", + "MARATHON_SINGLE_INSTANCE_APP": "true", + "DCOS_SERVICE_NAME": "{{service.name}}", + "DCOS_SERVICE_PORT_INDEX": "0", + "DCOS_SERVICE_SCHEME": "http" + }, + {{#security.secret-name}} + "container": { + "type": "MESOS", + "volumes":[ + { + "containerPath": "secrets/service-account.json", + "secret": "serviceCredential" + } + ] + }, + "secrets": { + "serviceCredential": { + "source": "{{security.secret-name}}" + } + }, + {{/security.secret-name}} + "env": { + "PACKAGE_NAME": "{{package-name}}", + "PACKAGE_VERSION": "{{package-version}}", + "PACKAGE_BUILD_TIME_EPOCH_MS": "1531343768523", + "PACKAGE_BUILD_TIME_STR": "2018-07-11T21:16:08.523025", + "FRAMEWORK_NAME": "{{service.name}}", + "FRAMEWORK_USER": "{{service.user}}", + "FRAMEWORK_PRINCIPAL": "{{service.service_account}}", + "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", + "MESOS_API_VERSION": "{{service.mesos_api_version}}", + + "GRAFANA_CPUS": "{{grafana.cpus}}", + "GRAFANA_MEM": "{{grafana.mem}}", + "GRAFANA_VOLUME": "{{grafana.volume.path}}", + "GRAFANA_VOLUME_TYPE": "{{grafana.volume.type}}", + "GRAFANA_VOLUME_SIZE": "{{grafana.volume.size}}", + "GRAFANA_INI": "{{grafana.ini}}", + "GRAFANA_DSP": "{{grafana.provisioning.datasources}}", + "GRAFANA_DBP": "{{grafana.provisioning.dashboards}}", + + "NODE_COUNT": "{{node.count}}", + "NODE_PLACEMENT": "{{{node.placement_constraint}}}", + + "NODE_CPUS": "{{node.cpus}}", + "NODE_MEM": "{{node.mem}}", + "NODE_DISK": "{{node.disk}}", + "NODE_DISK_TYPE": "{{node.disk_type}}", + + "JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}", + "EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}", + "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", + "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", + {{#security.secret-name}} + "DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json", + "MESOS_MODULES": "{\"libraries\":[{\"file\":\"libmesos-bundle\/lib\/mesos\/libdcos_security.so\",\"modules\":[{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"},{\"name\":\"com_mesosphere_dcos_http_Authenticatee\",\"parameters\":[{\"key\":\"jwt_exp_timeout\",\"value\":\"5mins\"},{\"key\":\"preemptive_refresh_duration\",\"value\":\"30mins\"}]}]}]}", + "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", + "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", + {{/security.secret-name}} + "LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}" + }, + "uris": [ + "{{resource.assets.uris.bootstrap-zip}}", + "{{resource.assets.uris.jre-tar-gz}}", + "{{resource.assets.uris.scheduler-zip}}", + "{{resource.assets.uris.libmesos-bundle-tar-gz}}", + "{{resource.assets.uris.svc}}" + ], + "upgradeStrategy":{ + "minimumHealthCapacity": 0, + "maximumOverCapacity": 0 + }, + "healthChecks": [ + { + "protocol": "MESOS_HTTP", + "path": "/v1/health", + "gracePeriodSeconds": 900, + "intervalSeconds": 30, + "portIndex": 0, + "timeoutSeconds": 30, + "maxConsecutiveFailures": 0 + } + ], + "portDefinitions": [ + { + "port": 0, + "protocol": "tcp", + "name": "api", + "labels": { "VIP_0": "/api.{{service.name}}:80" } + } + ] +} diff --git a/repo/packages/G/grafana/8/package.json b/repo/packages/G/grafana/8/package.json new file mode 100644 index 000000000..0db5b78f8 --- /dev/null +++ b/repo/packages/G/grafana/8/package.json @@ -0,0 +1,23 @@ +{ + "packagingVersion": "4.0", + "upgradesFrom": [ + "*" + ], + "downgradesTo": [ + "*" + ], + "minDcosReleaseVersion": "1.11", + "name": "grafana", + "version": "5.5.0-6.4.1", + "maintainer": "https://dcos.io/community", + "description": "Grafana on DC/OS", + "selected": false, + "framework": true, + "tags": [ + "grafana", + "monitoring", + "visualization" + ], + "postInstallNotes": "DC/OS Grafana is being installed!", + "postUninstallNotes": "DC/OS Grafana is being uninstalled." +} diff --git a/repo/packages/G/grafana/8/resource.json b/repo/packages/G/grafana/8/resource.json new file mode 100644 index 000000000..d83cda090 --- /dev/null +++ b/repo/packages/G/grafana/8/resource.json @@ -0,0 +1,62 @@ +{ + "assets": { + "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", + "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", + "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", + "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", + "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/8/svc.yml", + "grafana-tar-gz": "https://dl.grafana.com/oss/release/grafana-6.4.1.linux-amd64.tar.gz" + } + }, + "images": { + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", + "screenshots": [ + "https://prometheus.io/assets/grafana_prometheus.png", + "https://grafana.com/blog/img/docs/v45/query_inspector.png" + ] + }, + "cli": { + "binaries": { + "darwin": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin" + } + }, + "linux": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux" + } + }, + "windows": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe" + } + } + } + } +} From 5ecdc56b7644e0a4760a15e95f5df449630d31b3 Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 7 Oct 2019 19:21:42 +0000 Subject: [PATCH 10/13] Revert "Upgrade Grafana to 6.4.1" This reverts commit 50bc93752df0298f977908ab9eb04dfbec15bf7a. --- repo/packages/G/grafana/8/config.json | 142 ------------------ .../G/grafana/8/marathon.json.mustache | 104 ------------- repo/packages/G/grafana/8/package.json | 23 --- repo/packages/G/grafana/8/resource.json | 62 -------- 4 files changed, 331 deletions(-) delete mode 100644 repo/packages/G/grafana/8/config.json delete mode 100644 repo/packages/G/grafana/8/marathon.json.mustache delete mode 100644 repo/packages/G/grafana/8/package.json delete mode 100644 repo/packages/G/grafana/8/resource.json diff --git a/repo/packages/G/grafana/8/config.json b/repo/packages/G/grafana/8/config.json deleted file mode 100644 index bfb5c7abf..000000000 --- a/repo/packages/G/grafana/8/config.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "type": "object", - "properties": { - "service": { - "type": "object", - "description": "DC/OS service configuration properties", - "properties": { - "name": { - "description": "The name of the service instance", - "type": "string", - "default": "grafana", - "title": "Service name" - }, - "user": { - "description": "The user that the service will run as.", - "type": "string", - "default": "root", - "title": "User" - }, - "service_account": { - "description": "The service account for DC/OS service authentication. This is typically left empty to use the default unless service authentication is needed. The value given here is passed as the principal of Mesos framework.", - "type": "string", - "default": "" - }, - "service_account_secret": { - "description": "Name of the Secret Store credentials to use for DC/OS service authentication. This should be left empty unless service authentication is needed.", - "type": "string", - "default": "", - "title": "Credential secret name (optional)" - }, - "mesos_api_version": { - "description": "Configures the Mesos API version to use. Possible values: V0 (non-HTTP), V1 (HTTP)", - "type": "string", - "enum": [ - "V0", - "V1" - ], - "default": "V1" - }, - "log_level": { - "description": "The log level for the DC/OS service.", - "type": "string", - "enum": [ - "OFF", - "FATAL", - "ERROR", - "WARN", - "INFO", - "DEBUG", - "TRACE", - "ALL" - ], - "default": "INFO" - } - }, - "required": [ - "name", - "user" - ] - }, - "grafana": { - "description": "grafana pod configuration properties", - "type": "object", - "properties": { - "cpus": { - "description": "Grafana pod CPU requirements", - "type": "number", - "default": 0.2 - }, - "mem": { - "description": "Grafana pod mem requirements (in MB)", - "type": "integer", - "default": 2048 - }, - "volume": { - "description": "Grafana volume requirements", - "type": "object", - "properties": { - "path": { - "description": "Location of persistent volume to store data", - "type": "string", - "default": "grafana-data" - }, - "type": { - "description": "The type of persistent volume to use, one of ROOT or MOUNT", - "type": "string", - "default": "ROOT", - "enum": [ - "ROOT", - "MOUNT", - "PATH" - ] - }, - "size": { - "description": "The size of the persistent volume in MB", - "type": "integer", - "default": 512, - "minimum": 512 - } - } - }, - "ini": { - "description": "Base64 encoded conf/grafana.ini", - "type": "string", - "media": { - "binaryEncoding": "base64", - "type": "application/x-yaml" - }, - "default": "YXBwX21vZGUgPSBwcm9kdWN0aW9uCmluc3RhbmNlX25hbWUgPSAke0hPU1ROQU1FfQpbcGF0aHNdCmRhdGEgPSAvZ3JhZmFuYS1kYXRhCjt0ZW1wX2RhdGFfbGlmZXRpbWUgPSAyNGgKbG9ncyA9IC9ncmFmYW5hLWRhdGEKcGx1Z2lucyA9IC9ncmFmYW5hLWRhdGEvcGx1Z2lucwpwcm92aXNpb25pbmcgPSBjb25mL3Byb3Zpc2lvbmluZwoK" - }, - "provisioning": { - "description": "Provisioning properties to be used", - "type": "object", - "properties": { - "datasources": { - "description": "Base64 encoded conf/provisioning/datasources/datasources.yml", - "type": "string", - "media": { - "binaryEncoding": "base64", - "type": "application/x-yaml" - }, - "default": "YXBpVmVyc2lvbjogMQoKI2RlbGV0ZURhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICBvcmdJZDogMQoKI2RhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICB0eXBlOiBwcm9tZXRoZXVzCiMgICAgYWNjZXNzOiBwcm94eQojICAgIG9yZ0lkOiAxCiMgICAgdXJsOiBodHRwOi8vcHJvbWV0aGV1cy5wcm9tZXRoZXVzLmw0bGIudGhpc2Rjb3MuZGlyZWN0b3J5OjkwOTAKIyAgICBpc0RlZmF1bHQ6IHRydWUKIyAgICBqc29uRGF0YTogeyAidGltZUludGVydmFsIjogIjMwcyIgfQo" - }, - "dashboards": { - "description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config", - "type": "string", - "media": { - "binaryEncoding": "base64", - "type": "application/x-yaml" - }, - "default": "YXBpVmVyc2lvbjogMQoK" - } - } - } - }, - "required": [ - "cpus", - "mem" - ] - } - } -} diff --git a/repo/packages/G/grafana/8/marathon.json.mustache b/repo/packages/G/grafana/8/marathon.json.mustache deleted file mode 100644 index 87cb33be8..000000000 --- a/repo/packages/G/grafana/8/marathon.json.mustache +++ /dev/null @@ -1,104 +0,0 @@ - -{ - "id": "{{service.name}}", - "cpus": 1.0, - "mem": 1024, - "instances": 1, - "user": "{{service.user}}", - "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH; export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so); export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/jre/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms256M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./operator-scheduler/bin/operator svc.yml", - "labels": { - "DCOS_COMMONS_API_VERSION": "v1", - "DCOS_COMMONS_UNINSTALL": "true", - "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}", - "MARATHON_SINGLE_INSTANCE_APP": "true", - "DCOS_SERVICE_NAME": "{{service.name}}", - "DCOS_SERVICE_PORT_INDEX": "0", - "DCOS_SERVICE_SCHEME": "http" - }, - {{#security.secret-name}} - "container": { - "type": "MESOS", - "volumes":[ - { - "containerPath": "secrets/service-account.json", - "secret": "serviceCredential" - } - ] - }, - "secrets": { - "serviceCredential": { - "source": "{{security.secret-name}}" - } - }, - {{/security.secret-name}} - "env": { - "PACKAGE_NAME": "{{package-name}}", - "PACKAGE_VERSION": "{{package-version}}", - "PACKAGE_BUILD_TIME_EPOCH_MS": "1531343768523", - "PACKAGE_BUILD_TIME_STR": "2018-07-11T21:16:08.523025", - "FRAMEWORK_NAME": "{{service.name}}", - "FRAMEWORK_USER": "{{service.user}}", - "FRAMEWORK_PRINCIPAL": "{{service.service_account}}", - "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", - "MESOS_API_VERSION": "{{service.mesos_api_version}}", - - "GRAFANA_CPUS": "{{grafana.cpus}}", - "GRAFANA_MEM": "{{grafana.mem}}", - "GRAFANA_VOLUME": "{{grafana.volume.path}}", - "GRAFANA_VOLUME_TYPE": "{{grafana.volume.type}}", - "GRAFANA_VOLUME_SIZE": "{{grafana.volume.size}}", - "GRAFANA_INI": "{{grafana.ini}}", - "GRAFANA_DSP": "{{grafana.provisioning.datasources}}", - "GRAFANA_DBP": "{{grafana.provisioning.dashboards}}", - - "NODE_COUNT": "{{node.count}}", - "NODE_PLACEMENT": "{{{node.placement_constraint}}}", - - "NODE_CPUS": "{{node.cpus}}", - "NODE_MEM": "{{node.mem}}", - "NODE_DISK": "{{node.disk}}", - "NODE_DISK_TYPE": "{{node.disk_type}}", - - "JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}", - "EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}", - "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", - "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", - {{#security.secret-name}} - "DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json", - "MESOS_MODULES": "{\"libraries\":[{\"file\":\"libmesos-bundle\/lib\/mesos\/libdcos_security.so\",\"modules\":[{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"},{\"name\":\"com_mesosphere_dcos_http_Authenticatee\",\"parameters\":[{\"key\":\"jwt_exp_timeout\",\"value\":\"5mins\"},{\"key\":\"preemptive_refresh_duration\",\"value\":\"30mins\"}]}]}]}", - "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", - "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", - {{/security.secret-name}} - "LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}" - }, - "uris": [ - "{{resource.assets.uris.bootstrap-zip}}", - "{{resource.assets.uris.jre-tar-gz}}", - "{{resource.assets.uris.scheduler-zip}}", - "{{resource.assets.uris.libmesos-bundle-tar-gz}}", - "{{resource.assets.uris.svc}}" - ], - "upgradeStrategy":{ - "minimumHealthCapacity": 0, - "maximumOverCapacity": 0 - }, - "healthChecks": [ - { - "protocol": "MESOS_HTTP", - "path": "/v1/health", - "gracePeriodSeconds": 900, - "intervalSeconds": 30, - "portIndex": 0, - "timeoutSeconds": 30, - "maxConsecutiveFailures": 0 - } - ], - "portDefinitions": [ - { - "port": 0, - "protocol": "tcp", - "name": "api", - "labels": { "VIP_0": "/api.{{service.name}}:80" } - } - ] -} diff --git a/repo/packages/G/grafana/8/package.json b/repo/packages/G/grafana/8/package.json deleted file mode 100644 index 0db5b78f8..000000000 --- a/repo/packages/G/grafana/8/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "packagingVersion": "4.0", - "upgradesFrom": [ - "*" - ], - "downgradesTo": [ - "*" - ], - "minDcosReleaseVersion": "1.11", - "name": "grafana", - "version": "5.5.0-6.4.1", - "maintainer": "https://dcos.io/community", - "description": "Grafana on DC/OS", - "selected": false, - "framework": true, - "tags": [ - "grafana", - "monitoring", - "visualization" - ], - "postInstallNotes": "DC/OS Grafana is being installed!", - "postUninstallNotes": "DC/OS Grafana is being uninstalled." -} diff --git a/repo/packages/G/grafana/8/resource.json b/repo/packages/G/grafana/8/resource.json deleted file mode 100644 index d83cda090..000000000 --- a/repo/packages/G/grafana/8/resource.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "assets": { - "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", - "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", - "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", - "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", - "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/8/svc.yml", - "grafana-tar-gz": "https://dl.grafana.com/oss/release/grafana-6.4.1.linux-amd64.tar.gz" - } - }, - "images": { - "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", - "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", - "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", - "screenshots": [ - "https://prometheus.io/assets/grafana_prometheus.png", - "https://grafana.com/blog/img/docs/v45/query_inspector.png" - ] - }, - "cli": { - "binaries": { - "darwin": { - "x86-64": { - "contentHash": [ - { - "algo": "sha256", - "value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432" - } - ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin" - } - }, - "linux": { - "x86-64": { - "contentHash": [ - { - "algo": "sha256", - "value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339" - } - ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux" - } - }, - "windows": { - "x86-64": { - "contentHash": [ - { - "algo": "sha256", - "value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714" - } - ], - "kind": "executable", - "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe" - } - } - } - } -} From 6666f4c5ab5f14a16f1f803960b2f3071bad65a3 Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 7 Oct 2019 19:44:36 +0000 Subject: [PATCH 11/13] Revert "Merge branch 'version-3.x' of github.com:cbakersdl/universe into version-3.x" This reverts commit 6c1208564603c134e9bb5db9fa30d35f91744717, reversing changes made to e1502d2e4282eafe562f6bd53f11a5e4a3f31157. --- repo/packages/I/influxdb/2/config.json | 131 ------------------ .../I/influxdb/2/marathon.json.mustache | 78 ----------- repo/packages/I/influxdb/2/package.json | 20 --- repo/packages/I/influxdb/2/resource.json | 17 --- 4 files changed, 246 deletions(-) delete mode 100644 repo/packages/I/influxdb/2/config.json delete mode 100644 repo/packages/I/influxdb/2/marathon.json.mustache delete mode 100644 repo/packages/I/influxdb/2/package.json delete mode 100644 repo/packages/I/influxdb/2/resource.json diff --git a/repo/packages/I/influxdb/2/config.json b/repo/packages/I/influxdb/2/config.json deleted file mode 100644 index 5b6bdf47e..000000000 --- a/repo/packages/I/influxdb/2/config.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "properties": { - "service": { - "type": "object", - "description": "DC/OS service configuration properties", - "properties": { - "name": { - "description": "Name of this service instance", - "type": "string", - "default": "influxdb" - }, - "cpus": { - "description": "CPU shares to allocate to each service instance.", - "type": "number", - "default": 0.1, - "minimum": 0.1 - }, - "mem": { - "description": "Memory to allocate to each service instance.", - "type": "number", - "default": 2048.0, - "minimum": 1024.0 - } - }, - "required": [ - "cpus", - "mem" - ] - }, - "storage": { - "type": "object", - "description": "influxdb storage configuration properties", - "properties":{ - "host_volume_influxdb": { - "description": "If using non-persistent volumes (local volumes), this sets the location of a volume on the host to be used for the influxdb service to store the contents of the influxdb. The final location will be derived from this value plus the name set in `name` (e.g. `/mnt/host_volume/service_name`). This can be a mounted NFS drive. Note that this path must be the same on all DC/OS agents. NOTE: if you don't change the default /tmp value, YOUR DATA WILL NOT BE SAVED IN ANY WAY.", - "type": "string", - "default": "/tmp" - }, - "persistence": { - "type": "object", - "description": "Enable persistent storage.", - "properties": { - "enable": { - "description": "Enable or disable persistent storage.", - "type": "boolean", - "default": false - }, - "volume_mode_influxdb": { - "description": "Choose your mode: RW, R -> default RW.", - "type": "string", - "default": "RW" - } - } - } - } - }, - "networking": { - "type": "object", - "description": "influxdb networking configuration properties", - "properties": { - "port_api": { - "description": "Port number to be used for api communication internally to the cluster.", - "type": "number", - "default": 8086 - }, - "port_graphite": { - "description": "Port number to be used for Graphite input.", - "type": "number", - "default": 2003 - }, - "external_access": { - "type": "object", - "description": "Enable access from outside the cluster through Marathon-LB.\nNOTE: this connection is unencrypted.", - "properties": { - "enable": { - "description": "Enable or disable creating a VIP for external access through a public node running Marathon-LB.", - "type": "boolean", - "default": false - }, - "external_public_agent_ip": { - "description": "For external access, dns to be used for Marathon-LB vHost: For example use your public slave elb dns.", - "type": "string", - "default": "" - }, - "external_access_port": { - "description": "For external access, port number to be used for clear communication in the external Marathon-LB load balancer", - "type": "number", - "default": 18086 - } - } - } - } - }, - "configuration": { - "type": "object", - "description": "influxdb networking configuration properties", - "properties": { - "INFLUXDB_RETENTION_ENABLED": { - "description": "Set to false to prevent InfluxDB from enforcing retention policies.", - "type": "boolean", - "default": true - }, - "INFLUXDB_RETENTION_CHECK_INTERVAL": { - "description": "The rate at which InfluxDB checks to enforce a retention policy.", - "type": "string", - "default": "30m0s" - }, - "INFLUXDB_MONITOR_STORE_DATABASE": { - "description": "The destination database for recorded statistics.", - "type": "string", - "default": "_internal" - }, - "INFLUXDB_GRAPHITE_0_ENABLED": { - "description": "Set to true to enable Graphite input.", - "type": "boolean", - "default": false - }, - "INFLUXDB_GRAPHITE_0_DATABASE": { - "description": "The name of the Graphite database that you want to write to.", - "type": "string", - "default": "graphite" - }, - "INFLUXDB_GRAPHITE_0_TEMPLATES": { - "description": "The name of the Graphite database that you want to write to.", - "type": "string", - "default": "graphite.measurement*" - } - } - } - } -} diff --git a/repo/packages/I/influxdb/2/marathon.json.mustache b/repo/packages/I/influxdb/2/marathon.json.mustache deleted file mode 100644 index 60d8dedcf..000000000 --- a/repo/packages/I/influxdb/2/marathon.json.mustache +++ /dev/null @@ -1,78 +0,0 @@ -{ - "id": "{{service.name}}", - "cpus": {{service.cpus}}, - "mem": {{service.mem}}, - "instances": 1, - "env": { - "INFLUXDB_RETENTION_ENABLED": "{{configuration.INFLUXDB_RETENTION_ENABLED}}", - "INFLUXDB_RETENTION_CHECK_INTERVAL": "{{configuration.INFLUXDB_RETENTION_CHECK_INTERVAL}}", - "INFLUXDB_MONITOR_STORE_DATABASE": "{{configuration.INFLUXDB_MONITOR_STORE_DATABASE}}", - "INFLUXDB_GRAPHITE_0_ENABLED": "{{configuration.INFLUXDB_GRAPHITE_0_ENABLED}}", - "INFLUXDB_GRAPHITE_0_DATABASE": "{{configuration.INFLUXDB_GRAPHITE_0_DATABASE}}", - "INFLUXDB_GRAPHITE_0_TEMPLATES": "{{configuration.INFLUXDB_GRAPHITE_0_TEMPLATES}}" - }, - "container": { - "type": "DOCKER", - {{#storage.persistence.enable}} - "volumes": [{ - "containerPath": "/var/lib/influxdb", - "hostPath": "{{storage.host_volume_influxdb}}/{{service.name}}", - "mode": "{{storage.persistence.volume_mode_influxdb}}" - } - ], - {{/storage.persistence.enable}} - "docker": { - "image": "{{resource.assets.container.docker.influxdb-docker}}", - "network": "BRIDGE", - "portMappings": [ - { - "containerPort": 8086, - "hostPort": 0, - {{#networking.external_access.enable}} - "servicePort": {{networking.external_access.external_access_port}}, - {{/networking.external_access.enable}} - "protocol": "tcp", - "name": "influxdb-api", - "labels": { - "VIP_0": "/{{service.name}}:{{networking.port_api}}" - } - }, - { - "containerPort": 2003, - "hostPort": 0, - "protocol": "tcp", - "name": "influxdb-graphite", - "labels": { - "VIP_0": "/{{service.name}}:{{networking.port_graphite}}" - } - } - ], - "forcePullImage": true - } - }, - "healthChecks": [ - { - "protocol": "HTTP", - "path": "/ping", - "gracePeriodSeconds": 300, - "intervalSeconds": 60, - "timeoutSeconds": 20, - "maxConsecutiveFailures": 3, - "ignoreHttp1xx": false - } - ], - "labels": { - "DCOS_PACKAGE_VERSION": "1.4", - "DCOS_SERVICE_NAME": "{{service.name}}", - "MARATHON_SINGLE_INSTANCE_APP": "true", - {{#networking.external_access.enable}} - "HAPROXY_GROUP": "external", - "HAPROXY_0_VHOST": "{{networking.external_access.external_public_agent_ip}}", - {{/networking.external_access.enable}} - "DCOS_PACKAGE_IS_FRAMEWORK": "false" - }, - "upgradeStrategy":{ - "minimumHealthCapacity": 0, - "maximumOverCapacity": 0 - } -} diff --git a/repo/packages/I/influxdb/2/package.json b/repo/packages/I/influxdb/2/package.json deleted file mode 100644 index 51ded58e6..000000000 --- a/repo/packages/I/influxdb/2/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "packagingVersion": "3.0", - "minDcosReleaseVersion": "1.7", - "name": "influxdb", - "version": "1.4-1", - "scm": "https://github.com/influxdata/influxdb", - "maintainer": "https://dcos.io/community", - "website": "https://github.com/influxdata/influxdb", - "description": "InfluxDB is an open-source time series database developed by InfluxData as part of their time series platform. It is written in Go and optimized for fast, high-availability storage and retrieval of time series data in fields such as operations monitoring, application metrics, Internet of Things sensor data, and real-time analytics.\n\nThis package can be used alongside the DC/OS 'cadvisor' and 'grafana' packages for a cluster-wide monitoring solution.\n\nInstallation Documentation: https://github.com/dcos/examples/tree/master/cadvisor-influxdb-grafana\n\nNote: Since InfluxDB 1.3.0 the admin-api is depcrecated and no longer used\n\nNote: You need to manually create your database, e.g. with Chronograf", - "tags": ["docker", "influxdb", "database", "monitoring"], - "preInstallNotes": "This DC/OS Service is currently in preview. There may be bugs, incomplete features, incorrect documentation, or other discrepancies.\n\nAdvanced Installation options notes\n\nstorage / persistence: create local persistent volumes for internal storage files to survive across restarts or failures. \n\nstorage / host_volume: if /tmp for example is used it will try to mount /tmp/influxdb (make sure the influxdb folder exists within your host_volum /tmp) if persistence is not selected, this package can use a local volume in the host for storage, like a local directory or an NFS mount. The parameter host_volume controls the path in the host in which these volumes will be created, which MUST be the same on all nodes of the cluster.\n\nNOTE: If you didn't select persistence in the storage section, or provided a valid value for host_volume on installation,\nYOUR DATA WILL NOT BE SAVED IN ANY WAY.\n\nnetworking / port: This DC/OS service can be accessed from any other application through a NAMED VIP in the format service_name.marathon.l4lb.thisdcos.directory:port. Check status of the VIP in the Network tab of the DC/OS Dashboard (Enterprise DC/OS only).\n\nnetworking / external_access: create an entry in Marathon-LB for accessing the service from outside of the cluster\n\nnetworking / external_access_port: port to be used in Marathon-LB for accessing the service. \n\nnetworking / external_public_agent_ip: dns for Marathon-LB, typically set to your public agents public ip.\n\n Access your InfluxDB Server e.g. from your laptop with Chronograf: docker run -p 8888:8888 chronograf --influxdb-url=http://", - "postInstallNotes": "Service installed.", - "postUninstallNotes": "Service uninstalled. Note that any persisting data still exists and will need to be manually removed from the agent where the service was deployed.", - "licenses": [ - { - "name": "Apache License", - "url": "http://en.wikipedia.org/wiki/Apache_License" - } - ] -} \ No newline at end of file diff --git a/repo/packages/I/influxdb/2/resource.json b/repo/packages/I/influxdb/2/resource.json deleted file mode 100644 index 393a5d1e5..000000000 --- a/repo/packages/I/influxdb/2/resource.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "images": { - "icon-small": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-small.png", - "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-medium.png", - "icon-large": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-large.png", - "screenshots": [ - "https://raw.githubusercontent.com/Kentik/docker-monitor/master/screenshots/influxdb-screenshot.png" - ] - }, - "assets": { - "container": { - "docker": { - "influxdb-docker": "influxdb:1.4" - } - } - } -} From 43e82317857e31a85191fa41b718e603a378913b Mon Sep 17 00:00:00 2001 From: cbaker Date: Mon, 7 Oct 2019 20:01:07 +0000 Subject: [PATCH 12/13] Revert "Revert "Merge branch 'version-3.x' of github.com:cbakersdl/universe into version-3.x"" This reverts commit 6666f4c5ab5f14a16f1f803960b2f3071bad65a3. --- repo/packages/I/influxdb/2/config.json | 131 ++++++++++++++++++ .../I/influxdb/2/marathon.json.mustache | 78 +++++++++++ repo/packages/I/influxdb/2/package.json | 20 +++ repo/packages/I/influxdb/2/resource.json | 17 +++ 4 files changed, 246 insertions(+) create mode 100644 repo/packages/I/influxdb/2/config.json create mode 100644 repo/packages/I/influxdb/2/marathon.json.mustache create mode 100644 repo/packages/I/influxdb/2/package.json create mode 100644 repo/packages/I/influxdb/2/resource.json diff --git a/repo/packages/I/influxdb/2/config.json b/repo/packages/I/influxdb/2/config.json new file mode 100644 index 000000000..5b6bdf47e --- /dev/null +++ b/repo/packages/I/influxdb/2/config.json @@ -0,0 +1,131 @@ +{ + "properties": { + "service": { + "type": "object", + "description": "DC/OS service configuration properties", + "properties": { + "name": { + "description": "Name of this service instance", + "type": "string", + "default": "influxdb" + }, + "cpus": { + "description": "CPU shares to allocate to each service instance.", + "type": "number", + "default": 0.1, + "minimum": 0.1 + }, + "mem": { + "description": "Memory to allocate to each service instance.", + "type": "number", + "default": 2048.0, + "minimum": 1024.0 + } + }, + "required": [ + "cpus", + "mem" + ] + }, + "storage": { + "type": "object", + "description": "influxdb storage configuration properties", + "properties":{ + "host_volume_influxdb": { + "description": "If using non-persistent volumes (local volumes), this sets the location of a volume on the host to be used for the influxdb service to store the contents of the influxdb. The final location will be derived from this value plus the name set in `name` (e.g. `/mnt/host_volume/service_name`). This can be a mounted NFS drive. Note that this path must be the same on all DC/OS agents. NOTE: if you don't change the default /tmp value, YOUR DATA WILL NOT BE SAVED IN ANY WAY.", + "type": "string", + "default": "/tmp" + }, + "persistence": { + "type": "object", + "description": "Enable persistent storage.", + "properties": { + "enable": { + "description": "Enable or disable persistent storage.", + "type": "boolean", + "default": false + }, + "volume_mode_influxdb": { + "description": "Choose your mode: RW, R -> default RW.", + "type": "string", + "default": "RW" + } + } + } + } + }, + "networking": { + "type": "object", + "description": "influxdb networking configuration properties", + "properties": { + "port_api": { + "description": "Port number to be used for api communication internally to the cluster.", + "type": "number", + "default": 8086 + }, + "port_graphite": { + "description": "Port number to be used for Graphite input.", + "type": "number", + "default": 2003 + }, + "external_access": { + "type": "object", + "description": "Enable access from outside the cluster through Marathon-LB.\nNOTE: this connection is unencrypted.", + "properties": { + "enable": { + "description": "Enable or disable creating a VIP for external access through a public node running Marathon-LB.", + "type": "boolean", + "default": false + }, + "external_public_agent_ip": { + "description": "For external access, dns to be used for Marathon-LB vHost: For example use your public slave elb dns.", + "type": "string", + "default": "" + }, + "external_access_port": { + "description": "For external access, port number to be used for clear communication in the external Marathon-LB load balancer", + "type": "number", + "default": 18086 + } + } + } + } + }, + "configuration": { + "type": "object", + "description": "influxdb networking configuration properties", + "properties": { + "INFLUXDB_RETENTION_ENABLED": { + "description": "Set to false to prevent InfluxDB from enforcing retention policies.", + "type": "boolean", + "default": true + }, + "INFLUXDB_RETENTION_CHECK_INTERVAL": { + "description": "The rate at which InfluxDB checks to enforce a retention policy.", + "type": "string", + "default": "30m0s" + }, + "INFLUXDB_MONITOR_STORE_DATABASE": { + "description": "The destination database for recorded statistics.", + "type": "string", + "default": "_internal" + }, + "INFLUXDB_GRAPHITE_0_ENABLED": { + "description": "Set to true to enable Graphite input.", + "type": "boolean", + "default": false + }, + "INFLUXDB_GRAPHITE_0_DATABASE": { + "description": "The name of the Graphite database that you want to write to.", + "type": "string", + "default": "graphite" + }, + "INFLUXDB_GRAPHITE_0_TEMPLATES": { + "description": "The name of the Graphite database that you want to write to.", + "type": "string", + "default": "graphite.measurement*" + } + } + } + } +} diff --git a/repo/packages/I/influxdb/2/marathon.json.mustache b/repo/packages/I/influxdb/2/marathon.json.mustache new file mode 100644 index 000000000..60d8dedcf --- /dev/null +++ b/repo/packages/I/influxdb/2/marathon.json.mustache @@ -0,0 +1,78 @@ +{ + "id": "{{service.name}}", + "cpus": {{service.cpus}}, + "mem": {{service.mem}}, + "instances": 1, + "env": { + "INFLUXDB_RETENTION_ENABLED": "{{configuration.INFLUXDB_RETENTION_ENABLED}}", + "INFLUXDB_RETENTION_CHECK_INTERVAL": "{{configuration.INFLUXDB_RETENTION_CHECK_INTERVAL}}", + "INFLUXDB_MONITOR_STORE_DATABASE": "{{configuration.INFLUXDB_MONITOR_STORE_DATABASE}}", + "INFLUXDB_GRAPHITE_0_ENABLED": "{{configuration.INFLUXDB_GRAPHITE_0_ENABLED}}", + "INFLUXDB_GRAPHITE_0_DATABASE": "{{configuration.INFLUXDB_GRAPHITE_0_DATABASE}}", + "INFLUXDB_GRAPHITE_0_TEMPLATES": "{{configuration.INFLUXDB_GRAPHITE_0_TEMPLATES}}" + }, + "container": { + "type": "DOCKER", + {{#storage.persistence.enable}} + "volumes": [{ + "containerPath": "/var/lib/influxdb", + "hostPath": "{{storage.host_volume_influxdb}}/{{service.name}}", + "mode": "{{storage.persistence.volume_mode_influxdb}}" + } + ], + {{/storage.persistence.enable}} + "docker": { + "image": "{{resource.assets.container.docker.influxdb-docker}}", + "network": "BRIDGE", + "portMappings": [ + { + "containerPort": 8086, + "hostPort": 0, + {{#networking.external_access.enable}} + "servicePort": {{networking.external_access.external_access_port}}, + {{/networking.external_access.enable}} + "protocol": "tcp", + "name": "influxdb-api", + "labels": { + "VIP_0": "/{{service.name}}:{{networking.port_api}}" + } + }, + { + "containerPort": 2003, + "hostPort": 0, + "protocol": "tcp", + "name": "influxdb-graphite", + "labels": { + "VIP_0": "/{{service.name}}:{{networking.port_graphite}}" + } + } + ], + "forcePullImage": true + } + }, + "healthChecks": [ + { + "protocol": "HTTP", + "path": "/ping", + "gracePeriodSeconds": 300, + "intervalSeconds": 60, + "timeoutSeconds": 20, + "maxConsecutiveFailures": 3, + "ignoreHttp1xx": false + } + ], + "labels": { + "DCOS_PACKAGE_VERSION": "1.4", + "DCOS_SERVICE_NAME": "{{service.name}}", + "MARATHON_SINGLE_INSTANCE_APP": "true", + {{#networking.external_access.enable}} + "HAPROXY_GROUP": "external", + "HAPROXY_0_VHOST": "{{networking.external_access.external_public_agent_ip}}", + {{/networking.external_access.enable}} + "DCOS_PACKAGE_IS_FRAMEWORK": "false" + }, + "upgradeStrategy":{ + "minimumHealthCapacity": 0, + "maximumOverCapacity": 0 + } +} diff --git a/repo/packages/I/influxdb/2/package.json b/repo/packages/I/influxdb/2/package.json new file mode 100644 index 000000000..51ded58e6 --- /dev/null +++ b/repo/packages/I/influxdb/2/package.json @@ -0,0 +1,20 @@ +{ + "packagingVersion": "3.0", + "minDcosReleaseVersion": "1.7", + "name": "influxdb", + "version": "1.4-1", + "scm": "https://github.com/influxdata/influxdb", + "maintainer": "https://dcos.io/community", + "website": "https://github.com/influxdata/influxdb", + "description": "InfluxDB is an open-source time series database developed by InfluxData as part of their time series platform. It is written in Go and optimized for fast, high-availability storage and retrieval of time series data in fields such as operations monitoring, application metrics, Internet of Things sensor data, and real-time analytics.\n\nThis package can be used alongside the DC/OS 'cadvisor' and 'grafana' packages for a cluster-wide monitoring solution.\n\nInstallation Documentation: https://github.com/dcos/examples/tree/master/cadvisor-influxdb-grafana\n\nNote: Since InfluxDB 1.3.0 the admin-api is depcrecated and no longer used\n\nNote: You need to manually create your database, e.g. with Chronograf", + "tags": ["docker", "influxdb", "database", "monitoring"], + "preInstallNotes": "This DC/OS Service is currently in preview. There may be bugs, incomplete features, incorrect documentation, or other discrepancies.\n\nAdvanced Installation options notes\n\nstorage / persistence: create local persistent volumes for internal storage files to survive across restarts or failures. \n\nstorage / host_volume: if /tmp for example is used it will try to mount /tmp/influxdb (make sure the influxdb folder exists within your host_volum /tmp) if persistence is not selected, this package can use a local volume in the host for storage, like a local directory or an NFS mount. The parameter host_volume controls the path in the host in which these volumes will be created, which MUST be the same on all nodes of the cluster.\n\nNOTE: If you didn't select persistence in the storage section, or provided a valid value for host_volume on installation,\nYOUR DATA WILL NOT BE SAVED IN ANY WAY.\n\nnetworking / port: This DC/OS service can be accessed from any other application through a NAMED VIP in the format service_name.marathon.l4lb.thisdcos.directory:port. Check status of the VIP in the Network tab of the DC/OS Dashboard (Enterprise DC/OS only).\n\nnetworking / external_access: create an entry in Marathon-LB for accessing the service from outside of the cluster\n\nnetworking / external_access_port: port to be used in Marathon-LB for accessing the service. \n\nnetworking / external_public_agent_ip: dns for Marathon-LB, typically set to your public agents public ip.\n\n Access your InfluxDB Server e.g. from your laptop with Chronograf: docker run -p 8888:8888 chronograf --influxdb-url=http://", + "postInstallNotes": "Service installed.", + "postUninstallNotes": "Service uninstalled. Note that any persisting data still exists and will need to be manually removed from the agent where the service was deployed.", + "licenses": [ + { + "name": "Apache License", + "url": "http://en.wikipedia.org/wiki/Apache_License" + } + ] +} \ No newline at end of file diff --git a/repo/packages/I/influxdb/2/resource.json b/repo/packages/I/influxdb/2/resource.json new file mode 100644 index 000000000..393a5d1e5 --- /dev/null +++ b/repo/packages/I/influxdb/2/resource.json @@ -0,0 +1,17 @@ +{ + "images": { + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/influxdb-icon-large.png", + "screenshots": [ + "https://raw.githubusercontent.com/Kentik/docker-monitor/master/screenshots/influxdb-screenshot.png" + ] + }, + "assets": { + "container": { + "docker": { + "influxdb-docker": "influxdb:1.4" + } + } + } +} From 2a1c9f5c3a4c05d671121489925ca946bf95e36d Mon Sep 17 00:00:00 2001 From: cbaker Date: Tue, 8 Oct 2019 14:23:40 +0000 Subject: [PATCH 13/13] Revert "Revert "Upgrade Grafana to 6.4.1"" This reverts commit 5ecdc56b7644e0a4760a15e95f5df449630d31b3. --- repo/packages/G/grafana/8/config.json | 142 ++++++++++++++++++ .../G/grafana/8/marathon.json.mustache | 104 +++++++++++++ repo/packages/G/grafana/8/package.json | 23 +++ repo/packages/G/grafana/8/resource.json | 62 ++++++++ 4 files changed, 331 insertions(+) create mode 100644 repo/packages/G/grafana/8/config.json create mode 100644 repo/packages/G/grafana/8/marathon.json.mustache create mode 100644 repo/packages/G/grafana/8/package.json create mode 100644 repo/packages/G/grafana/8/resource.json diff --git a/repo/packages/G/grafana/8/config.json b/repo/packages/G/grafana/8/config.json new file mode 100644 index 000000000..bfb5c7abf --- /dev/null +++ b/repo/packages/G/grafana/8/config.json @@ -0,0 +1,142 @@ +{ + "type": "object", + "properties": { + "service": { + "type": "object", + "description": "DC/OS service configuration properties", + "properties": { + "name": { + "description": "The name of the service instance", + "type": "string", + "default": "grafana", + "title": "Service name" + }, + "user": { + "description": "The user that the service will run as.", + "type": "string", + "default": "root", + "title": "User" + }, + "service_account": { + "description": "The service account for DC/OS service authentication. This is typically left empty to use the default unless service authentication is needed. The value given here is passed as the principal of Mesos framework.", + "type": "string", + "default": "" + }, + "service_account_secret": { + "description": "Name of the Secret Store credentials to use for DC/OS service authentication. This should be left empty unless service authentication is needed.", + "type": "string", + "default": "", + "title": "Credential secret name (optional)" + }, + "mesos_api_version": { + "description": "Configures the Mesos API version to use. Possible values: V0 (non-HTTP), V1 (HTTP)", + "type": "string", + "enum": [ + "V0", + "V1" + ], + "default": "V1" + }, + "log_level": { + "description": "The log level for the DC/OS service.", + "type": "string", + "enum": [ + "OFF", + "FATAL", + "ERROR", + "WARN", + "INFO", + "DEBUG", + "TRACE", + "ALL" + ], + "default": "INFO" + } + }, + "required": [ + "name", + "user" + ] + }, + "grafana": { + "description": "grafana pod configuration properties", + "type": "object", + "properties": { + "cpus": { + "description": "Grafana pod CPU requirements", + "type": "number", + "default": 0.2 + }, + "mem": { + "description": "Grafana pod mem requirements (in MB)", + "type": "integer", + "default": 2048 + }, + "volume": { + "description": "Grafana volume requirements", + "type": "object", + "properties": { + "path": { + "description": "Location of persistent volume to store data", + "type": "string", + "default": "grafana-data" + }, + "type": { + "description": "The type of persistent volume to use, one of ROOT or MOUNT", + "type": "string", + "default": "ROOT", + "enum": [ + "ROOT", + "MOUNT", + "PATH" + ] + }, + "size": { + "description": "The size of the persistent volume in MB", + "type": "integer", + "default": 512, + "minimum": 512 + } + } + }, + "ini": { + "description": "Base64 encoded conf/grafana.ini", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBwX21vZGUgPSBwcm9kdWN0aW9uCmluc3RhbmNlX25hbWUgPSAke0hPU1ROQU1FfQpbcGF0aHNdCmRhdGEgPSAvZ3JhZmFuYS1kYXRhCjt0ZW1wX2RhdGFfbGlmZXRpbWUgPSAyNGgKbG9ncyA9IC9ncmFmYW5hLWRhdGEKcGx1Z2lucyA9IC9ncmFmYW5hLWRhdGEvcGx1Z2lucwpwcm92aXNpb25pbmcgPSBjb25mL3Byb3Zpc2lvbmluZwoK" + }, + "provisioning": { + "description": "Provisioning properties to be used", + "type": "object", + "properties": { + "datasources": { + "description": "Base64 encoded conf/provisioning/datasources/datasources.yml", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBpVmVyc2lvbjogMQoKI2RlbGV0ZURhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICBvcmdJZDogMQoKI2RhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICB0eXBlOiBwcm9tZXRoZXVzCiMgICAgYWNjZXNzOiBwcm94eQojICAgIG9yZ0lkOiAxCiMgICAgdXJsOiBodHRwOi8vcHJvbWV0aGV1cy5wcm9tZXRoZXVzLmw0bGIudGhpc2Rjb3MuZGlyZWN0b3J5OjkwOTAKIyAgICBpc0RlZmF1bHQ6IHRydWUKIyAgICBqc29uRGF0YTogeyAidGltZUludGVydmFsIjogIjMwcyIgfQo" + }, + "dashboards": { + "description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config", + "type": "string", + "media": { + "binaryEncoding": "base64", + "type": "application/x-yaml" + }, + "default": "YXBpVmVyc2lvbjogMQoK" + } + } + } + }, + "required": [ + "cpus", + "mem" + ] + } + } +} diff --git a/repo/packages/G/grafana/8/marathon.json.mustache b/repo/packages/G/grafana/8/marathon.json.mustache new file mode 100644 index 000000000..87cb33be8 --- /dev/null +++ b/repo/packages/G/grafana/8/marathon.json.mustache @@ -0,0 +1,104 @@ + +{ + "id": "{{service.name}}", + "cpus": 1.0, + "mem": 1024, + "instances": 1, + "user": "{{service.user}}", + "cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH; export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so); export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/jre/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms256M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./operator-scheduler/bin/operator svc.yml", + "labels": { + "DCOS_COMMONS_API_VERSION": "v1", + "DCOS_COMMONS_UNINSTALL": "true", + "DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}", + "MARATHON_SINGLE_INSTANCE_APP": "true", + "DCOS_SERVICE_NAME": "{{service.name}}", + "DCOS_SERVICE_PORT_INDEX": "0", + "DCOS_SERVICE_SCHEME": "http" + }, + {{#security.secret-name}} + "container": { + "type": "MESOS", + "volumes":[ + { + "containerPath": "secrets/service-account.json", + "secret": "serviceCredential" + } + ] + }, + "secrets": { + "serviceCredential": { + "source": "{{security.secret-name}}" + } + }, + {{/security.secret-name}} + "env": { + "PACKAGE_NAME": "{{package-name}}", + "PACKAGE_VERSION": "{{package-version}}", + "PACKAGE_BUILD_TIME_EPOCH_MS": "1531343768523", + "PACKAGE_BUILD_TIME_STR": "2018-07-11T21:16:08.523025", + "FRAMEWORK_NAME": "{{service.name}}", + "FRAMEWORK_USER": "{{service.user}}", + "FRAMEWORK_PRINCIPAL": "{{service.service_account}}", + "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", + "MESOS_API_VERSION": "{{service.mesos_api_version}}", + + "GRAFANA_CPUS": "{{grafana.cpus}}", + "GRAFANA_MEM": "{{grafana.mem}}", + "GRAFANA_VOLUME": "{{grafana.volume.path}}", + "GRAFANA_VOLUME_TYPE": "{{grafana.volume.type}}", + "GRAFANA_VOLUME_SIZE": "{{grafana.volume.size}}", + "GRAFANA_INI": "{{grafana.ini}}", + "GRAFANA_DSP": "{{grafana.provisioning.datasources}}", + "GRAFANA_DBP": "{{grafana.provisioning.dashboards}}", + + "NODE_COUNT": "{{node.count}}", + "NODE_PLACEMENT": "{{{node.placement_constraint}}}", + + "NODE_CPUS": "{{node.cpus}}", + "NODE_MEM": "{{node.mem}}", + "NODE_DISK": "{{node.disk}}", + "NODE_DISK_TYPE": "{{node.disk_type}}", + + "JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}", + "EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}", + "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", + "GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}", + {{#security.secret-name}} + "DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json", + "MESOS_MODULES": "{\"libraries\":[{\"file\":\"libmesos-bundle\/lib\/mesos\/libdcos_security.so\",\"modules\":[{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"},{\"name\":\"com_mesosphere_dcos_http_Authenticatee\",\"parameters\":[{\"key\":\"jwt_exp_timeout\",\"value\":\"5mins\"},{\"key\":\"preemptive_refresh_duration\",\"value\":\"30mins\"}]}]}]}", + "MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee", + "MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee", + {{/security.secret-name}} + "LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}" + }, + "uris": [ + "{{resource.assets.uris.bootstrap-zip}}", + "{{resource.assets.uris.jre-tar-gz}}", + "{{resource.assets.uris.scheduler-zip}}", + "{{resource.assets.uris.libmesos-bundle-tar-gz}}", + "{{resource.assets.uris.svc}}" + ], + "upgradeStrategy":{ + "minimumHealthCapacity": 0, + "maximumOverCapacity": 0 + }, + "healthChecks": [ + { + "protocol": "MESOS_HTTP", + "path": "/v1/health", + "gracePeriodSeconds": 900, + "intervalSeconds": 30, + "portIndex": 0, + "timeoutSeconds": 30, + "maxConsecutiveFailures": 0 + } + ], + "portDefinitions": [ + { + "port": 0, + "protocol": "tcp", + "name": "api", + "labels": { "VIP_0": "/api.{{service.name}}:80" } + } + ] +} diff --git a/repo/packages/G/grafana/8/package.json b/repo/packages/G/grafana/8/package.json new file mode 100644 index 000000000..0db5b78f8 --- /dev/null +++ b/repo/packages/G/grafana/8/package.json @@ -0,0 +1,23 @@ +{ + "packagingVersion": "4.0", + "upgradesFrom": [ + "*" + ], + "downgradesTo": [ + "*" + ], + "minDcosReleaseVersion": "1.11", + "name": "grafana", + "version": "5.5.0-6.4.1", + "maintainer": "https://dcos.io/community", + "description": "Grafana on DC/OS", + "selected": false, + "framework": true, + "tags": [ + "grafana", + "monitoring", + "visualization" + ], + "postInstallNotes": "DC/OS Grafana is being installed!", + "postUninstallNotes": "DC/OS Grafana is being uninstalled." +} diff --git a/repo/packages/G/grafana/8/resource.json b/repo/packages/G/grafana/8/resource.json new file mode 100644 index 000000000..d83cda090 --- /dev/null +++ b/repo/packages/G/grafana/8/resource.json @@ -0,0 +1,62 @@ +{ + "assets": { + "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", + "bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip", + "executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip", + "scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip", + "svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/8/svc.yml", + "grafana-tar-gz": "https://dl.grafana.com/oss/release/grafana-6.4.1.linux-amd64.tar.gz" + } + }, + "images": { + "icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png", + "icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png", + "icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png", + "screenshots": [ + "https://prometheus.io/assets/grafana_prometheus.png", + "https://grafana.com/blog/img/docs/v45/query_inspector.png" + ] + }, + "cli": { + "binaries": { + "darwin": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin" + } + }, + "linux": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux" + } + }, + "windows": { + "x86-64": { + "contentHash": [ + { + "algo": "sha256", + "value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714" + } + ], + "kind": "executable", + "url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe" + } + } + } + } +}