Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EED6618E0C for ; Tue, 9 Feb 2016 19:09:59 +0000 (UTC) Received: (qmail 57280 invoked by uid 500); 9 Feb 2016 19:09:59 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 57249 invoked by uid 500); 9 Feb 2016 19:09:59 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 57240 invoked by uid 99); 9 Feb 2016 19:09:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2016 19:09:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B77EE031B; Tue, 9 Feb 2016 19:09:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: avijayan@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-14962 : Auto configure AMS UI to use AMS Datasource - Commit 2 (avijayan) Date: Tue, 9 Feb 2016 19:09:59 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 14396f2b7 -> 37122a6d3 AMBARI-14962 : Auto configure AMS UI to use AMS Datasource - Commit 2 (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37122a6d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37122a6d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37122a6d Branch: refs/heads/trunk Commit: 37122a6d3aa7f5b5cb48c85a420be1c389010951 Parents: 14396f2 Author: Aravindan Vijayan Authored: Tue Feb 9 11:09:26 2016 -0800 Committer: Aravindan Vijayan Committed: Tue Feb 9 11:09:26 2016 -0800 ---------------------------------------------------------------------- .../templates/metrics_grafana_datasource.json.j2 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37122a6d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 index 3edc6fb..1b03a2d 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 @@ -1,3 +1,21 @@ +{# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#} + { "name": "{{ams_datasource_name}}", "type": "ambarimetrics",