Repository: ambari Updated Branches: refs/heads/branch-2.4 1209a706d -> d7446b9bb
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7446b9b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json deleted file mode 100644 index fba32bd..0000000 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json +++ /dev/null @@ -1,692 +0,0 @@ -{ - "id": null, - "title": "YARN - TimelineServer", - "originalTitle": "YARN - TimelineServer", - "tags": [ - "yarn" - ], - "style": "dark", - "timezone": "browser", - "editable": true, - "hideControls": false, - "sharedCrosshair": false, - "rows": [ - { - "collapse": false, - "editable": true, - "height": "25px", - "panels": [ - { - "content": "<h4 align=\"center\">Metrics to see the overall status for Timeline Server. </h4>\n<h6 style=\"color:red;\" align=\"center\">This dashboard is managed by Ambari. You may lose any changes made to this dashboard. If you want to customize, make your own copy.</h6>", - "editable": true, - "error": false, - "id": 5, - "isNew": true, - "links": [], - "mode": "html", - "span": 12, - "style": {}, - "title": "", - "type": "text" - } - ], - "title": "New row" - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 1, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "alias": "", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "yarn.TimelineDataManagerMetrics.GetEntitiesTotal", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Timeline Entity Data Reads", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 3, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "yarn.TimelineDataManagerMetrics.GetEntitiesTimeAvgTime", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Timeline Entity Data Read time", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "short" - ] - } - ], - "showTitle": true, - "title": "Data Reads" - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 2, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "yarn.TimelineDataManagerMetrics.PostEntitiesTotal", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Timeline Entity Data Write", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 4, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "yarn.TimelineDataManagerMetrics.PostEntitiesTimeAvgTime", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Timeline Entity Data Write Time", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "ms", - "short" - ] - } - ], - "showTitle": true, - "title": "Data Writes" - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 6, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "alias": "GC Count", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.GcCount", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "GC Count", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 7, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "alias": "GC Time", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.GcTimeMillis", - "precision": "default", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "GC Time", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "µs", - "short" - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 8, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "alias": "Max Heap", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "hosts": "", - "metric": "jvm.JvmMetrics.MemHeapMaxM", - "precision": "default", - "refId": "A" - }, - { - "aggregator": "max", - "alias": "Heap Used", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.MemHeapUsedM", - "precision": "default", - "refId": "B" - }, - { - "aggregator": "max", - "alias": "Heap Committed", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.MemHeapCommittedM", - "precision": "default", - "refId": "C" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Heap Usage", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 9, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "aggregator": "max", - "alias": "NonHeap Committed", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.MemNonHeapCommittedM", - "precision": "default", - "refId": "A" - }, - { - "aggregator": "max", - "alias": "NonHeap Used", - "app": "applicationhistoryserver", - "downsampleAggregator": "avg", - "errors": {}, - "metric": "jvm.JvmMetrics.MemNonHeapUsedM", - "precision": "default", - "refId": "B" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "NonHeap Usage", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ] - } - ], - "showTitle": true, - "title": "JVM Metrics" - } - ], - "time": { - "from": "now-6h", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "schemaVersion": 8, - "version": 10, - "links": [ - { - "asDropdown": true, - "icon": "external link", - "keepTime": true, - "tags": [ - "yarn" - ], - "title": "YARN Dashboards", - "type": "dashboards" - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d7446b9b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py index 15c96dd..a02c100 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py @@ -294,8 +294,6 @@ def create_ams_dashboards(): dashboard_def['tags'].append(version) else: dashboard_def['tags'] = [ 'builtin', version ] - - dashboard_def['overwrite'] = True for dashboard in existing_dashboards: if dashboard.title == dashboard_def['title']: @@ -311,7 +309,7 @@ def create_ams_dashboards(): (dashboard_def['title'], dashboard_def['tags'])) # Discrepancy in grafana export vs import format - dashboard_def_payload = { "dashboard" : dashboard_def } + dashboard_def_payload = { "dashboard" : dashboard_def, 'overwrite': True } paylaod = json.dumps(dashboard_def_payload).strip() (response, data) = perform_grafana_post_call(GRAFANA_DASHBOARDS_URL, paylaod, server) http://git-wip-us.apache.org/repos/asf/ambari/blob/d7446b9b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index 7e81a88..2503c43 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -66,15 +66,23 @@ metric_truststore_ca_certs='ca.pem' agent_cache_dir = config['hostLevelParams']['agentCacheDir'] service_package_folder = config['commandParams']['service_package_folder'] -dashboards_dir = os.path.join(agent_cache_dir, service_package_folder, 'files', 'grafana-dashboards') +stack_name = default("/hostLevelParams/stack_name", None) +dashboards_dirs = [] +# Stack specific +dashboards_dirs.append(os.path.join(agent_cache_dir, service_package_folder, + 'files', 'grafana-dashboards', stack_name)) +# Default +dashboards_dirs.append(os.path.join(agent_cache_dir, service_package_folder, + 'files', 'grafana-dashboards', 'default')) def get_grafana_dashboard_defs(): dashboard_defs = [] - if os.path.exists(dashboards_dir): - for root, dirs, files in os.walk(dashboards_dir): - for file in files: - if 'grafana' in file: - dashboard_defs.append(os.path.join(root, file)) + for dashboards_dir in dashboards_dirs: + if os.path.exists(dashboards_dir): + for root, dirs, files in os.walk(dashboards_dir): + for file in files: + if 'grafana' in file: + dashboard_defs.append(os.path.join(root, file)) return dashboard_defs # find ambari version for grafana dashboards
