metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject incubator-metron git commit: METRON-641 Fix Kibana install file (DimDroll via ottobackwards) closes apache/incubator-metron#405
Date Fri, 10 Mar 2017 03:16:15 GMT
Repository: incubator-metron
Updated Branches:
  refs/heads/master 2c9299eec -> 8b6fc2e60


METRON-641 Fix Kibana install file (DimDroll via ottobackwards) closes apache/incubator-metron#405


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/8b6fc2e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/8b6fc2e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/8b6fc2e6

Branch: refs/heads/master
Commit: 8b6fc2e60f8021e7e2e4896d836e7e739393491f
Parents: 2c9299e
Author: DimDroll <dimdroll@gmail.com>
Authored: Thu Mar 9 21:08:00 2017 -0500
Committer: Otto Fowler <otto@apache.org>
Committed: Thu Mar 9 21:08:00 2017 -0500

----------------------------------------------------------------------
 .../KIBANA/4.5.1/package/scripts/kibana_master.py            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8b6fc2e6/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py
index f296272..028ea9e 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/kibana_master.py
@@ -53,9 +53,9 @@ class Kibana(Script):
         majorVersion = OSCheck.get_os_major_version()
         Logger.info("CentOS/RHEL major version reported by Ambari: " + majorVersion)
         if majorVersion == "6" or majorVersion == "7":
-            repoName = "name=CentOS/RHEL {} repository for Elasticsearch Curator 4.x packages\n".format(majorVersion)
-            baseUrl = "baseurl=http://packages.elastic.co/curator/4/centos/{}\n".format(majorVersion)
-            Logger.info("Installing Elasticsearch Curator CentOS/RHEL {} repo".format(majorVersion))
+            repoName = "name=CentOS/RHEL {0} repository for Elasticsearch Curator 4.x packages\n".format(majorVersion)
+            baseUrl = "baseurl=http://packages.elastic.co/curator/4/centos/{0}\n".format(majorVersion)
+            Logger.info("Installing Elasticsearch Curator CentOS/RHEL {0} repo".format(majorVersion))
             Execute("echo \"[curator-4]\n" +
                     repoName +
                     baseUrl +
@@ -81,7 +81,7 @@ class Kibana(Script):
                   group=params.kibana_user
                   )
 
-        File("{}/kibana.yml".format(params.conf_dir),
+        File("{0}/kibana.yml".format(params.conf_dir),
              owner=params.kibana_user,
              content=InlineTemplate(params.kibana_yml_template)
              )


Mime
View raw message