From af0517bd25c0da2a0cb1bdd0a124d29844c9423f Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 25 Aug 2015 11:55:44 -0400 Subject: [PATCH 001/165] initial checkin --- extensions/appdynamics/__init__.py | 0 extensions/appdynamics/extension.py | 182 ++++++++++++++++++++++++++++ manifest.yml | 9 ++ 3 files changed, 191 insertions(+) create mode 100644 extensions/appdynamics/__init__.py create mode 100644 extensions/appdynamics/extension.py diff --git a/extensions/appdynamics/__init__.py b/extensions/appdynamics/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py new file mode 100644 index 000000000..5a928f9a7 --- /dev/null +++ b/extensions/appdynamics/extension.py @@ -0,0 +1,182 @@ +# 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. +"""AppDynamics Extension + +Downloads, installs and configures the AppDynamics agent for PHP +""" +import os +import os.path +import logging + + +_log = logging.getLogger('appdynamics') + + +DEFAULTS = { + 'APPDYNAMICS_HOST': 's3-us-west-2.amazonaws.com/niksappd', + 'APPDYNAMICS_VERSION': '4.1.1.0', + 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', + 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' + 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', +} + + +class AppDynamicsInstaller(object): + def __init__(self, ctx): + self._log = _log + self._ctx = ctx + self._detected = False + self.app_name = None + self.license_key = None + try: + self._log.info("Initializing") + if ctx['PHP_VM'] == 'php': + self._merge_defaults() + self._load_service_info() + self._load_php_info() + self._load_appdynamics_info() + except Exception: + self._log.exception("Error installing AppDynamics! " + "AppDynamics will not be available.") + + def _merge_defaults(self): + for key, val in DEFAULTS.iteritems(): + if key not in self._ctx: + self._ctx[key] = val + + def _load_service_info(self): + services = self._ctx.get('VCAP_SERVICES', {}) + services = services.get('appdynamics', []) + if len(services) == 0: + self._log.info("AppDynamics services not detected.") + if len(services) > 1: + self._log.warn("Multiple AppDynamics services found, " + "credentials from first one.") + if len(services) > 0: + service = services[0] + creds = service.get('credentials', {}) + self.license_key = creds.get('licenseKey', None) + if self.license_key: + self._log.debug("AppDynamics service detected.") + self._detected = True + + def _load_appdynamics_info(self): + vcap_app = self._ctx.get('VCAP_APPLICATION', {}) + self.app_name = vcap_app.get('name', None) + self._log.debug("App Name [%s]", self.app_name) + + if 'APPDYNAMICS_LICENSE' in self._ctx.keys(): + if self._detected: + self._log.warn("Detected a AppDynamics Service & Manual Key," + " using the manual key.") + self.license_key = self._ctx['APPDYNAMICS_LICENSE'] + self._detected = True + + if self._detected: + appdynamics_so_name = 'appdynamics-%s%s.so' % ( + self._php_api, (self._php_zts and 'zts' or '')) + self.appdynamics_so = os.path.join('@{HOME}', 'appdynamics', + 'agent', self._php_arch, + appdynamics_so_name) + self._log.debug("PHP Extension [%s]", self.appdynamics_so) + self.log_path = os.path.join('@{HOME}', 'logs', + 'appdynamics-daemon.log') + self._log.debug("Log Path [%s]", self.log_path) + self.daemon_path = os.path.join( + '@{HOME}', 'appdynamics', 'daemon', + 'appdynamics-daemon.%s' % self._php_arch) + self._log.debug("Daemon [%s]", self.daemon_path) + self.socket_path = os.path.join('@{HOME}', 'appdynamics', + 'daemon.sock') + self._log.debug("Socket [%s]", self.socket_path) + self.pid_path = os.path.join('@{HOME}', 'appdynamics', + 'daemon.pid') + self._log.debug("Pid File [%s]", self.pid_path) + + def _load_php_info(self): + self.php_ini_path = os.path.join(self._ctx['BUILD_DIR'], + 'php', 'etc', 'php.ini') + self._php_extn_dir = self._find_php_extn_dir() + self._php_api, self._php_zts = self._parse_php_api() + self._php_arch = self._ctx.get('APPDYNAMICS_ARCH', 'x64') + self._log.debug("PHP API [%s] Arch [%s]", + self._php_api, self._php_arch) + + def _find_php_extn_dir(self): + with open(self.php_ini_path, 'rt') as php_ini: + for line in php_ini.readlines(): + if line.startswith('extension_dir'): + (key, val) = line.strip().split(' = ') + return val.strip('"') + + def _parse_php_api(self): + tmp = os.path.basename(self._php_extn_dir) + php_api = tmp.split('-')[-1] + php_zts = (tmp.find('non-zts') == -1) + return php_api, php_zts + + def should_install(self): + return self._detected + + def modify_php_ini(self): +# with open(self.php_ini_path, 'rt') as php_ini: +# lines = php_ini.readlines() +# extns = [line for line in lines if line.startswith('extension=')] +# if len(extns) > 0: +# pos = lines.index(extns[-1]) + 1 +# else: +# pos = lines.index('#{PHP_EXTENSIONS}\n') + 1 +# lines.insert(pos, 'extension=%s\n' % self.appdynamics_so) +# lines.append('\n') +# lines.append('[appdynamics]\n') +# lines.append('appdynamics.license=%s\n' % self.license_key) +# lines.append('appdynamics.appname=%s\n' % self.app_name) +# lines.append('appdynamics.daemon.logfile=%s\n' % self.log_path) +# lines.append('appdynamics.daemon.location=%s\n' % self.daemon_path) +# lines.append('appdynamics.daemon.port=%s\n' % self.socket_path) +# lines.append('appdynamics.daemon.pidfile=%s\n' % self.pid_path) +# with open(self.php_ini_path, 'wt') as php_ini: +# for line in lines: +# php_ini.write(line) + + exit_code = os.system("echo calling out env; env") + exit_code = os.system("echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") + exit_code = os.system("echo $HOSTNAME") + exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME") + exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") + exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") + +# Extension Methods +def preprocess_commands(ctx): + return () + + +def service_commands(ctx): + return {} + + +def service_environment(ctx): + return {} + + +def compile(install): + appdynamics = AppDynamicsInstaller(install.builder._ctx) + if appdynamics.should_install(): + _log.info("Installing AppDynamics") + install.package('APPDYNAMICS') + _log.info("Configuring AppDynamics in php.ini") + appdynamics.modify_php_ini() + _log.info("AppDynamics Installed.") + return 0 diff --git a/manifest.yml b/manifest.yml index 56282bcca..b3e40f31b 100644 --- a/manifest.yml +++ b/manifest.yml @@ -15,6 +15,9 @@ exclude_files: - php_buildpack-*v* url_to_dependency_map: + - match: appdynamics-php-agent-x64-linux-(\d+\.\d+\.\d+\.\d+) + name: appdynamics + version: "$1" - match: newrelic-php5-(\d+\.\d+\.\d+\.\d+)-linux name: newrelic version: "$1" @@ -26,6 +29,12 @@ url_to_dependency_map: version: "$1" dependencies: + - name: appdynamics + version: 4.1.1.0 + uri: https://s3-us-west-2.amazonaws.com/niksappd/appdynamics-php-agent-x64-linux-4.1.1.0.tar.gz + cf_stacks: + - cflinuxfs2 + md5: cd9dbe7e3cc51031db1e429fbc934b64 - name: newrelic version: 4.20.2.95 uri: https://download.newrelic.com/php_agent/archive/4.20.2.95/newrelic-php5-4.20.2.95-linux.tar.gz From 338a9783edc3b8cb5528b633b040a815e7b2baad Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 26 Aug 2015 10:39:52 -0400 Subject: [PATCH 002/165] user-provided service detect --- extensions/appdynamics/extension.py | 10 +- tests/test_appdynamics.py | 276 ++++++++++++++++++++++++++++ 2 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 tests/test_appdynamics.py diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5a928f9a7..3b63b35f5 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -60,7 +60,15 @@ def _load_service_info(self): services = self._ctx.get('VCAP_SERVICES', {}) services = services.get('appdynamics', []) if len(services) == 0: - self._log.info("AppDynamics services not detected.") + self._log.info("AppDynamics services with tag appdynamics not detected.") + self._log.info("Looking for app-dynamics service.") + services = services.get('app-dynamics', []) + if len(services) == 0: + self._log.info("AppDynamics services with tag app-dynamics not detected.") + self._log.info("Looking for user-provided service.") + services = services.get('user-provided', []) + if len(services) == 0: + self._log.info("AppDynamics services not detected.") if len(services) > 1: self._log.warn("Multiple AppDynamics services found, " "credentials from first one.") diff --git a/tests/test_appdynamics.py b/tests/test_appdynamics.py new file mode 100644 index 000000000..f5c3dd921 --- /dev/null +++ b/tests/test_appdynamics.py @@ -0,0 +1,276 @@ +import os +import os.path +import tempfile +import shutil +import json +from nose.tools import eq_ +from nose.tools import with_setup +from build_pack_utils import utils +from common.integration import ErrorHelper +from common.components import BuildPackAssertHelper +from common.components import HttpdAssertHelper +from common.components import PhpAssertHelper +from common.components import NoWebServerAssertHelper +from common.components import NewRelicAssertHelper +from common.components import HhvmAssertHelper +from common.components import DownloadAssertHelper +from common.base import BaseCompileApp + + +newrelic = utils.load_extension('extensions/newrelic') + + +class TestNewRelic(object): + def setUp(self): + self.build_dir = tempfile.mkdtemp('build-') + self.php_dir = os.path.join(self.build_dir, 'php', 'etc') + os.makedirs(self.php_dir) + shutil.copy('defaults/config/php/5.4.x/php.ini', self.php_dir) + + def tearDown(self): + if os.path.exists(self.build_dir): + shutil.rmtree(self.build_dir) + + def testDefaults(self): + nr = newrelic.NewRelicInstaller(utils.FormattedDict({ + 'BUILD_DIR': self.build_dir, + 'PHP_VM': 'php' + })) + eq_(True, 'APPDYNAMICS_HOST' in nr._ctx.keys()) + eq_(True, 'APPDYNAMICS_VERSION' in nr._ctx.keys()) + eq_(True, 'APPDYNAMICS_PACKAGE' in nr._ctx.keys()) + eq_(True, 'APPDYNAMICS_DOWNLOAD_URL' in nr._ctx.keys()) + eq_(True, 'APPDYNAMICS_STRIP' in nr._ctx.keys()) + + def testShouldNotInstall(self): + nr = newrelic.NewRelicInstaller(utils.FormattedDict({ + 'BUILD_DIR': self.build_dir + })) + eq_(False, nr.should_install()) + + @with_setup(setup=setUp, teardown=tearDown) + def testShouldInstall(self): + ctx = utils.FormattedDict({ + 'BUILD_DIR': self.build_dir, + 'APPDYNAMICS_LICENSE': 'JUNK_LICENSE', + 'VCAP_APPLICATION': { + 'name': 'app-name-1' + }, + 'PHP_VM': 'php' + }) + nr = newrelic.NewRelicInstaller(ctx) + eq_(True, nr.should_install()) + eq_('x64', nr._php_arch) + eq_('@{HOME}/php/lib/php/extensions/no-debug-non-zts-20100525', + nr._php_extn_dir) + eq_(False, nr._php_zts) + eq_('20100525', nr._php_api) + eq_('@{HOME}/newrelic/agent/x64/newrelic-20100525.so', nr.newrelic_so) + eq_('app-name-1', nr.app_name) + eq_('JUNK_LICENSE', nr.license_key) + eq_('@{HOME}/logs/newrelic-daemon.log', nr.log_path) + eq_('@{HOME}/newrelic/daemon/newrelic-daemon.x64', nr.daemon_path) + eq_('@{HOME}/newrelic/daemon.sock', nr.socket_path) + eq_('@{HOME}/newrelic/daemon.pid', nr.pid_path) + + @with_setup(setup=setUp, teardown=tearDown) + def testShouldInstallService(self): + ctx = utils.FormattedDict({ + 'BUILD_DIR': self.build_dir, + 'VCAP_SERVICES': { + 'newrelic': [{ + 'name': 'newrelic', + 'label': 'newrelic', + 'tags': ['Monitoring'], + 'plan': 'standard', + 'credentials': {'licenseKey': 'LICENSE'}}] + }, + 'VCAP_APPLICATION': { + 'name': 'app-name-1' + }, + 'PHP_VM': 'php' + }) + nr = newrelic.NewRelicInstaller(ctx) + eq_(True, nr.should_install()) + eq_('x64', nr._php_arch) + eq_('@{HOME}/php/lib/php/extensions/no-debug-non-zts-20100525', + nr._php_extn_dir) + eq_(False, nr._php_zts) + eq_('20100525', nr._php_api) + eq_('@{HOME}/newrelic/agent/x64/newrelic-20100525.so', nr.newrelic_so) + eq_('app-name-1', nr.app_name) + eq_('LICENSE', nr.license_key) + eq_('@{HOME}/logs/newrelic-daemon.log', nr.log_path) + eq_('@{HOME}/newrelic/daemon/newrelic-daemon.x64', nr.daemon_path) + eq_('@{HOME}/newrelic/daemon.sock', nr.socket_path) + eq_('@{HOME}/newrelic/daemon.pid', nr.pid_path) + + @with_setup(setup=setUp, teardown=tearDown) + def testShouldInstallServiceAndManual(self): + ctx = utils.FormattedDict({ + 'BUILD_DIR': self.build_dir, + 'VCAP_SERVICES': { + 'newrelic': [{ + 'name': 'newrelic', + 'label': 'newrelic', + 'tags': ['Monitoring'], + 'plan': 'standard', + 'credentials': {'licenseKey': 'LICENSE'}}] + }, + 'APPDYNAMICS_LICENSE': 'LICENSE2', + 'VCAP_APPLICATION': { + 'name': 'app-name-2' + }, + 'PHP_VM': 'php' + }) + nr = newrelic.NewRelicInstaller(ctx) + eq_(True, nr.should_install()) + eq_('x64', nr._php_arch) + eq_('@{HOME}/php/lib/php/extensions/no-debug-non-zts-20100525', + nr._php_extn_dir) + eq_(False, nr._php_zts) + eq_('20100525', nr._php_api) + eq_('@{HOME}/newrelic/agent/x64/newrelic-20100525.so', nr.newrelic_so) + eq_('app-name-2', nr.app_name) + eq_('LICENSE2', nr.license_key) + eq_('@{HOME}/logs/newrelic-daemon.log', nr.log_path) + eq_('@{HOME}/newrelic/daemon/newrelic-daemon.x64', nr.daemon_path) + eq_('@{HOME}/newrelic/daemon.sock', nr.socket_path) + eq_('@{HOME}/newrelic/daemon.pid', nr.pid_path) + + @with_setup(setup=setUp, teardown=tearDown) + def testModifyPhpIni(self): + ctx = utils.FormattedDict({ + 'BUILD_DIR': self.build_dir, + 'APPDYNAMICS_LICENSE': 'JUNK_LICENSE', + 'VCAP_APPLICATION': { + 'name': 'app-name-1' + }, + 'PHP_VM': 'php' + }) + nr = newrelic.NewRelicInstaller(ctx) + nr.modify_php_ini() + with open(os.path.join(self.php_dir, 'php.ini'), 'rt') as php_ini: + lines = php_ini.readlines() + eq_(True, lines.index('extension=%s\n' % nr.newrelic_so) >= 0) + eq_(True, lines.index('[newrelic]\n') >= 0) + eq_(True, lines.index('newrelic.license=JUNK_LICENSE\n') >= 0) + eq_(True, lines.index('newrelic.appname=%s\n' % nr.app_name) >= 0) + + +class TestNewRelicCompiled(BaseCompileApp): + def __init__(self): + self.app_name = 'app-1' + + def setUp(self): + BaseCompileApp.setUp(self) + os.environ['APPDYNAMICS_LICENSE'] = 'JUNK_LICENSE' + os.environ['VCAP_APPLICATION'] = json.dumps({ + 'name': 'app-name-1' + }) + + def test_with_httpd_and_newrelic(self): + # helpers to confirm the environment + bp = BuildPackAssertHelper() + nr = NewRelicAssertHelper() + httpd = HttpdAssertHelper() + php = PhpAssertHelper() + # set web server to httpd, since that's what we're expecting here + self.opts.set_web_server('httpd') + # run the compile step of the build pack + output = ErrorHelper().compile(self.bp) + # confirm downloads + DownloadAssertHelper(3, 2).assert_downloads_from_output(output) + # confirm start script + bp.assert_start_script_is_correct(self.build_dir) + httpd.assert_start_script_is_correct(self.build_dir) + php.assert_start_script_is_correct(self.build_dir) + # confirm bp utils installed + bp.assert_scripts_are_installed(self.build_dir) + bp.assert_config_options(self.build_dir) + # check env & proc files + httpd.assert_contents_of_procs_file(self.build_dir) + httpd.assert_contents_of_env_file(self.build_dir) + php.assert_contents_of_procs_file(self.build_dir) + php.assert_contents_of_env_file(self.build_dir) + # webdir exists + httpd.assert_web_dir_exists(self.build_dir, self.opts.get_webdir()) + # check php & httpd installed + httpd.assert_files_installed(self.build_dir) + php.assert_files_installed(self.build_dir) + nr.assert_files_installed(self.build_dir) + + def test_with_httpd_hhvm_and_newrelic(self): + # helpers to confirm the environment + bp = BuildPackAssertHelper() + nr = NewRelicAssertHelper() + httpd = HttpdAssertHelper() + hhvm = HhvmAssertHelper() + # set web server to httpd, since that's what we're expecting here + self.opts.set_php_vm('hhvm') + self.opts.set_hhvm_download_url( + '{DOWNLOAD_URL}/hhvm/{HHVM_VERSION}/{HHVM_PACKAGE}') + self.opts.set_web_server('httpd') + # run the compile step of the build pack + output = ErrorHelper().compile(self.bp) + # confirm downloads + DownloadAssertHelper(2, 2).assert_downloads_from_output(output) + # confirm start script + bp.assert_start_script_is_correct(self.build_dir) + httpd.assert_start_script_is_correct(self.build_dir) + hhvm.assert_start_script_is_correct(self.build_dir) + # confirm bp utils installed + bp.assert_scripts_are_installed(self.build_dir) + bp.assert_config_options(self.build_dir) + # check env & proc files + httpd.assert_contents_of_procs_file(self.build_dir) + httpd.assert_contents_of_env_file(self.build_dir) + hhvm.assert_contents_of_procs_file(self.build_dir) + hhvm.assert_contents_of_env_file(self.build_dir) + # webdir exists + httpd.assert_web_dir_exists(self.build_dir, self.opts.get_webdir()) + # check php & httpd installed + httpd.assert_files_installed(self.build_dir) + hhvm.assert_files_installed(self.build_dir) + # Test NewRelic should not be installed w/HHVM + nr.is_not_installed(self.build_dir) + + +class TestNewRelicWithApp5(BaseCompileApp): + def __init__(self): + self.app_name = 'app-5' + + def setUp(self): + BaseCompileApp.setUp(self) + os.environ['APPDYNAMICS_LICENSE'] = 'JUNK_LICENSE' + os.environ['VCAP_APPLICATION'] = json.dumps({ + 'name': 'app-name-1' + }) + + def test_standalone(self): + # helpers to confirm the environment + bp = BuildPackAssertHelper() + php = PhpAssertHelper() + none = NoWebServerAssertHelper() + nr = NewRelicAssertHelper() + # no web server + self.opts.set_web_server('none') + # run the compile step of the build pack + output = ErrorHelper().compile(self.bp) + # confirm downloads + DownloadAssertHelper(2, 1).assert_downloads_from_output(output) + # confirm httpd and nginx are not installed + none.assert_no_web_server_is_installed(self.build_dir) + # confirm start script + bp.assert_start_script_is_correct(self.build_dir) + php.assert_start_script_is_correct(self.build_dir) + # confirm bp utils installed + bp.assert_scripts_are_installed(self.build_dir) + # check env & proc files + none.assert_contents_of_procs_file(self.build_dir) + php.assert_contents_of_env_file(self.build_dir) + # webdir exists + none.assert_no_web_dir(self.build_dir, self.opts.get_webdir()) + # check php cli installed + none.assert_files_installed(self.build_dir) + nr.assert_files_installed(self.build_dir) From 576ce30dbadadbe0ff07cb98c613242e2f01d96c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 26 Aug 2015 10:46:23 -0400 Subject: [PATCH 003/165] user-provided service detect --- extensions/appdynamics/extension.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 3b63b35f5..e15d4df93 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -58,22 +58,22 @@ def _merge_defaults(self): def _load_service_info(self): services = self._ctx.get('VCAP_SERVICES', {}) - services = services.get('appdynamics', []) - if len(services) == 0: + service_defs = services.get('appdynamics', []) + if len(service_defs) == 0: self._log.info("AppDynamics services with tag appdynamics not detected.") self._log.info("Looking for app-dynamics service.") - services = services.get('app-dynamics', []) - if len(services) == 0: + service_defs = services.get('app-dynamics', []) + if len(service_defs) == 0: self._log.info("AppDynamics services with tag app-dynamics not detected.") self._log.info("Looking for user-provided service.") - services = services.get('user-provided', []) - if len(services) == 0: + service_defs = services.get('user-provided', []) + if len(service_defs) == 0: self._log.info("AppDynamics services not detected.") - if len(services) > 1: + if len(service_defs) > 1: self._log.warn("Multiple AppDynamics services found, " "credentials from first one.") - if len(services) > 0: - service = services[0] + if len(service_defs) > 0: + service = service_defs[0] creds = service.get('credentials', {}) self.license_key = creds.get('licenseKey', None) if self.license_key: From 243d47f289c92066c2763c7393088ed45784ce49 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 26 Aug 2015 11:43:38 -0400 Subject: [PATCH 004/165] service detect --- extensions/appdynamics/extension.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index e15d4df93..156c3d536 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -39,7 +39,7 @@ def __init__(self, ctx): self._ctx = ctx self._detected = False self.app_name = None - self.license_key = None + self.account-access-key = None try: self._log.info("Initializing") if ctx['PHP_VM'] == 'php': @@ -65,7 +65,7 @@ def _load_service_info(self): service_defs = services.get('app-dynamics', []) if len(service_defs) == 0: self._log.info("AppDynamics services with tag app-dynamics not detected.") - self._log.info("Looking for user-provided service.") + self._log.info("Looking for Appdynamics user-provided service.") service_defs = services.get('user-provided', []) if len(service_defs) == 0: self._log.info("AppDynamics services not detected.") @@ -75,8 +75,8 @@ def _load_service_info(self): if len(service_defs) > 0: service = service_defs[0] creds = service.get('credentials', {}) - self.license_key = creds.get('licenseKey', None) - if self.license_key: + self.account-access-key = creds.get('account-access-key', None) + if self.account-access-key: self._log.debug("AppDynamics service detected.") self._detected = True From 1b212b62d3505f012e6cd931d05c1f3479cd12ce Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 27 Aug 2015 06:00:21 -0400 Subject: [PATCH 005/165] add debug logs --- extensions/appdynamics/extension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 156c3d536..5c188794a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -57,6 +57,7 @@ def _merge_defaults(self): self._ctx[key] = val def _load_service_info(self): + self._log.info("Loading AppDynamics service info.") services = self._ctx.get('VCAP_SERVICES', {}) service_defs = services.get('appdynamics', []) if len(service_defs) == 0: From 12169652c15d41b016dafb1db1f8566ab55bb9ca Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 27 Aug 2015 06:03:29 -0400 Subject: [PATCH 006/165] add debug logs --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5c188794a..3ee79a5dd 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -39,7 +39,7 @@ def __init__(self, ctx): self._ctx = ctx self._detected = False self.app_name = None - self.account-access-key = None + self.account_access_key = None try: self._log.info("Initializing") if ctx['PHP_VM'] == 'php': @@ -76,8 +76,8 @@ def _load_service_info(self): if len(service_defs) > 0: service = service_defs[0] creds = service.get('credentials', {}) - self.account-access-key = creds.get('account-access-key', None) - if self.account-access-key: + self.account_access_key = creds.get('account_access_key', None) + if self.account_access_key: self._log.debug("AppDynamics service detected.") self._detected = True From f06c00fa6f9187a9437f4933ea6fa68c6b93f994 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 27 Aug 2015 06:10:16 -0400 Subject: [PATCH 007/165] add debug log --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 3ee79a5dd..9e717c6b0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -62,7 +62,7 @@ def _load_service_info(self): service_defs = services.get('appdynamics', []) if len(service_defs) == 0: self._log.info("AppDynamics services with tag appdynamics not detected.") - self._log.info("Looking for app-dynamics service.") + self._log.info("Looking for tag app-dynamics service.") service_defs = services.get('app-dynamics', []) if len(service_defs) == 0: self._log.info("AppDynamics services with tag app-dynamics not detected.") From b06c26d1eb1bbf4caf530d9e9678237ebb2d8c6d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 27 Aug 2015 07:03:39 -0400 Subject: [PATCH 008/165] correct access key name --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9e717c6b0..d693ec47b 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -76,7 +76,7 @@ def _load_service_info(self): if len(service_defs) > 0: service = service_defs[0] creds = service.get('credentials', {}) - self.account_access_key = creds.get('account_access_key', None) + self.account_access_key = creds.get('account-access-key', None) if self.account_access_key: self._log.debug("AppDynamics service detected.") self._detected = True From 613ca100358adb1459920c6702fbc4f6e627444f Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:30:25 -0400 Subject: [PATCH 009/165] runtime env --- extensions/appdynamics/extension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index d693ec47b..bf19a738b 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,6 +173,7 @@ def preprocess_commands(ctx): def service_commands(ctx): + exit_code = os.system("echo in service_commands; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") return {} From 2b48ee1a31784d2d3916f122566b48a67f8d6061 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:42:07 -0400 Subject: [PATCH 010/165] runtime env --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index bf19a738b..c98ff0ce2 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,8 @@ def preprocess_commands(ctx): def service_commands(ctx): - exit_code = os.system("echo in service_commands; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") + exit_code = os.system("!!!! service_commands; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") + _log.debug("!!!! in service_commands") return {} From 252c7703287a8d8653b3982019c73cf640dfbe80 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:48:05 -0400 Subject: [PATCH 011/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c98ff0ce2..32d547a84 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,7 @@ def preprocess_commands(ctx): def service_commands(ctx): exit_code = os.system("!!!! service_commands; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") - _log.debug("!!!! in service_commands") +# _log.debug("!!!! in service_commands") return {} From 648a3ddce4ae55d37b98bded2f40591b390229bf Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:51:03 -0400 Subject: [PATCH 012/165] runtime env --- extensions/appdynamics/extension.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 32d547a84..99e79e242 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -169,6 +169,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): + exit_code = os.system("!!!! preprocess_commands") return () @@ -179,10 +180,12 @@ def service_commands(ctx): def service_environment(ctx): + exit_code = os.system("!!!! service_environment") return {} def compile(install): + exit_code = os.system("!!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) if appdynamics.should_install(): _log.info("Installing AppDynamics") From cc8d999bc052fdc8e2de95d62df57d91423c71fb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:53:05 -0400 Subject: [PATCH 013/165] runtime env --- extensions/appdynamics/extension.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 99e79e242..4f093718a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -169,23 +169,23 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): - exit_code = os.system("!!!! preprocess_commands") + exit_code = os.system("echo !!! preprocess_commands") return () def service_commands(ctx): - exit_code = os.system("!!!! service_commands; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") + exit_code = os.system("echo !!!! service_commands") # _log.debug("!!!! in service_commands") return {} def service_environment(ctx): - exit_code = os.system("!!!! service_environment") + exit_code = os.system("echo !!!! service_environment") return {} def compile(install): - exit_code = os.system("!!!! compile ") + exit_code = os.system("echo !!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) if appdynamics.should_install(): _log.info("Installing AppDynamics") From 87b5907228197526f4116270f7d0da5ad5903f0f Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 04:59:55 -0400 Subject: [PATCH 014/165] runtime env --- extensions/appdynamics/extension.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4f093718a..8f58b8395 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -170,17 +170,18 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") + exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return () - def service_commands(ctx): exit_code = os.system("echo !!!! service_commands") -# _log.debug("!!!! in service_commands") + exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} def service_environment(ctx): exit_code = os.system("echo !!!! service_environment") + exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} From a4889a05059d15cab73671a778f7fd23c2beb7ac Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 05:09:15 -0400 Subject: [PATCH 015/165] runtime env --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8f58b8395..bf8ebb509 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -170,18 +170,18 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") - exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") + exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return () def service_commands(ctx): exit_code = os.system("echo !!!! service_commands") - exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") + exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} def service_environment(ctx): exit_code = os.system("echo !!!! service_environment") - exit_code = os.system("pwd; ls -al; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") + exit_code = os.system("pwd; ls -al; env ;echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} From 836c227eb08b0373d138370f6b3ebc733a83c036 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 05:26:32 -0400 Subject: [PATCH 016/165] runtime env --- bin/start | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/start b/bin/start index 89145e01c..264743347 100755 --- a/bin/start +++ b/bin/start @@ -41,4 +41,5 @@ if __name__ == '__main__': pm.add_process(name, cmd) # Start Everything + exit_code = os.system("echo in Start; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") sys.exit(pm.loop()) From 985bbb01401f9f8159441eb2781cd8dc2d22c67c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 06:18:55 -0400 Subject: [PATCH 017/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index bf8ebb509..2b1f151b3 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - return () + return ("ps -ef ; echo preprocess_commands ", "env ") def service_commands(ctx): exit_code = os.system("echo !!!! service_commands") From e6d6a5d6be0846adaeec0794f8b785962e278919 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 06:54:37 -0400 Subject: [PATCH 018/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 2b1f151b3..a260f7f0c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - return ("ps -ef ; echo preprocess_commands ", "env ") + return ('echo preprocess_commands') def service_commands(ctx): exit_code = os.system("echo !!!! service_commands") From 8e693d63207435058f5a40c92affcf59750104bb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:06:20 -0400 Subject: [PATCH 019/165] runtime env --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a260f7f0c..7b254174e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,8 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - return ('echo preprocess_commands') + ctx.put("ADDITIONAL_PREPROCESS_CMDS","env") + return () def service_commands(ctx): exit_code = os.system("echo !!!! service_commands") From 077fc39d26ef757e01acf47da8ba426b9c18ca4c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:08:06 -0400 Subject: [PATCH 020/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7b254174e..8f384eefa 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - ctx.put("ADDITIONAL_PREPROCESS_CMDS","env") + ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") return () def service_commands(ctx): From 6aba9e6b3d4a580b89f89df535840d5b704f6cd4 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:12:22 -0400 Subject: [PATCH 021/165] runtime env --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8f384eefa..8c2a4f038 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,8 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") + #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env" return () def service_commands(ctx): From 0c2a222e8f223b05842a27d6ca895cbe5d32aea3 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:16:54 -0400 Subject: [PATCH 022/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8c2a4f038..0a25c8bec 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,7 +172,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME='$(expr "$VCAP_APPLICATION" : ''.*instance_index[": ]*\([[:digit:]]*\).*'')' && echo $APPDYNAMICS_NODENAME" return () def service_commands(ctx): From 34c766854e02ac309301508cb32a71d9701a6446 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:18:37 -0400 Subject: [PATCH 023/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 0a25c8bec..70723cc02 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,7 +172,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME='$(expr "$VCAP_APPLICATION" : ''.*instance_index[": ]*\([[:digit:]]*\).*'')' && echo $APPDYNAMICS_NODENAME" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME='$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'')' && echo $APPDYNAMICS_NODENAME" return () def service_commands(ctx): From 5128d89f85116ae3b6319181d762842e33a701e6 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:26:35 -0400 Subject: [PATCH 024/165] runtime env --- extensions/appdynamics/extension.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 70723cc02..a6cb19528 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,7 +172,9 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME='$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'')' && echo $APPDYNAMICS_NODENAME" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + return () def service_commands(ctx): From 572d5b66992990a0236db76eb19c26c39e9ad78a Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:30:11 -0400 Subject: [PATCH 025/165] runtime env --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a6cb19528..eff0f1ea9 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,7 @@ def preprocess_commands(ctx): exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' return () From 33fac9e9a70a4a54313dc0bcb1a0757296ccb2b8 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:36:31 -0400 Subject: [PATCH 026/165] runtime env --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index eff0f1ea9..fe347a119 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,8 @@ def preprocess_commands(ctx): exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' + ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION}' return () From 5dbed994bb19046bafe5cf424c0193a26413262a Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:37:37 -0400 Subject: [PATCH 027/165] log lines --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index fe347a119..75a6c3203 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,7 @@ def preprocess_commands(ctx): #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' - ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION}' + ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo $VCAP_APPLICATION' return () From 04c3c62c5f969838ba38a48d9dfc17075c0a3029 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:38:54 -0400 Subject: [PATCH 028/165] log lines --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 75a6c3203..80f0172bd 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,7 @@ def preprocess_commands(ctx): #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' - ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo $VCAP_APPLICATION' + ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo $VCAP_APPLICATION | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' return () From db17f7b51d2f70919413d3275083044abf102ac1 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 07:41:40 -0400 Subject: [PATCH 029/165] log lines --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 80f0172bd..6455f964e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,7 @@ def preprocess_commands(ctx): #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' - ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo $VCAP_APPLICATION | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" return () From c28da29fac44cd52b405920ca30158d44e1a1b52 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 08:57:10 -0400 Subject: [PATCH 030/165] logs --- bin/start | 1 - extensions/appdynamics/extension.py | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bin/start b/bin/start index 264743347..89145e01c 100755 --- a/bin/start +++ b/bin/start @@ -41,5 +41,4 @@ if __name__ == '__main__': pm.add_process(name, cmd) # Start Everything - exit_code = os.system("echo in Start; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini") sys.exit(pm.loop()) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 6455f964e..fcdca4ab6 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -159,13 +159,13 @@ def modify_php_ini(self): # with open(self.php_ini_path, 'wt') as php_ini: # for line in lines: # php_ini.write(line) - - exit_code = os.system("echo calling out env; env") - exit_code = os.system("echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - exit_code = os.system("echo $HOSTNAME") - exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME") - exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") - exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") +# +# exit_code = os.system("echo calling out env; env") +# exit_code = os.system("echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") +# exit_code = os.system("echo $HOSTNAME") +# exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME") +# exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") +# exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") # Extension Methods def preprocess_commands(ctx): @@ -174,19 +174,17 @@ def preprocess_commands(ctx): #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo Hi" return () def service_commands(ctx): - exit_code = os.system("echo !!!! service_commands") - exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} def service_environment(ctx): - exit_code = os.system("echo !!!! service_environment") - exit_code = os.system("pwd; ls -al; env ;echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") return {} From bad3217509704b1a8c1bc0226b73c9a8fb39b1b5 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 08:58:26 -0400 Subject: [PATCH 031/165] logs --- extensions/appdynamics/extension.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index fcdca4ab6..70082b12a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,8 +175,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo Hi" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" return () From 45ab2be88c0fca4799818e53027baf2283cab0d0 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:01:42 -0400 Subject: [PATCH 032/165] logs --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 70082b12a..df39c3b5b 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -166,11 +166,12 @@ def modify_php_ini(self): # exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME") # exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") # exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") + exit_code = os.system("echo adding to phpini") # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") - exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") + #exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' From 9576383ae1c31af07b42561d9187bdc743f37999 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:03:15 -0400 Subject: [PATCH 033/165] logs --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index df39c3b5b..c0210d14d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,8 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo HI" return () From 426d74c7d369f9c1b3cff84fc222f431926cf6ee Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:04:51 -0400 Subject: [PATCH 034/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c0210d14d..b49c0882f 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo HI" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']"echo HI" return () From 0ac3132e1c3a4d0fb0d343beeaf738c2ee0ddac7 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:07:29 -0400 Subject: [PATCH 035/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index b49c0882f..ed1b6c31a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']"echo HI" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']+"echo HI" return () From 78057e5a06c9d347f58ae85eef809ab942e418c4 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:09:13 -0400 Subject: [PATCH 036/165] logs --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ed1b6c31a..e4802b8af 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,8 +176,8 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']+"echo HI" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']+"echo HI" return () From 9af62394ced86d5d65268fa9f1632d936def9c4f Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:11:37 -0400 Subject: [PATCH 037/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index e4802b8af..ee81ba1da 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']+"echo HI" return () From f5aaaf36829733d481424baef003b0fceb511674 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:14:41 -0400 Subject: [PATCH 038/165] logs --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ee81ba1da..74fdf1c5a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,8 +176,8 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = ctx['ADDITIONAL_PREPROCESS_CMDS']+"echo HI" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app && chmod 777 /home/vcap/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo Hello" return () From 42c6b2f17cc1b9365a3ad6a349b8ddc10289ed75 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:16:56 -0400 Subject: [PATCH 039/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 74fdf1c5a..377b21467 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app && chmod 777 /home/vcap/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo Hello" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "pwd && chmod 777 /home/vcap/app && chmod 777 /home/vcap/app/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo Hello" return () From 9f5412f0700fa5678f17ec1f2bbd1773e3c33de8 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:19:26 -0400 Subject: [PATCH 040/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 377b21467..ef20eacf1 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "pwd && chmod 777 /home/vcap/app && chmod 777 /home/vcap/app/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo Hello" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "pwd && chmod 777 /home/vcap/app && chmod 777 /home/vcap/app/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo $APP_HOSTNAME" return () From e7b62d4480d1040f40ea7e6dd3942a7e49330def Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:22:35 -0400 Subject: [PATCH 041/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ef20eacf1..b53b048ea 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "pwd && chmod 777 /home/vcap/app && chmod 777 /home/vcap/app/appdynamics/logs && export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'` && echo $APP_HOSTNAME" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo $APP_HOSTNAME" return () From 3ae44a04b1427cec4d3b38381fe82b26cb5b78df Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:25:44 -0400 Subject: [PATCH 042/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index b53b048ea..2eb2f58ec 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo $APP_HOSTNAME" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" return () From dc35d3a29a2beeced92cb8fd0b0acd65e4e8fd9c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:27:33 -0400 Subject: [PATCH 043/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 2eb2f58ec..c1ea7fbd0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app/appdynamics ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" return () From 9e07f3bcb3b65b7427d84ebb135d5b0aeec4fb91 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:32:34 -0400 Subject: [PATCH 044/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c1ea7fbd0..4a01a7990 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app/appdynamics ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app/appdynamics ; ls -la app/ ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" return () From d67847552ac13893b013649c028e1d67230058c6 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 09:35:24 -0400 Subject: [PATCH 045/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4a01a7990..4a153f5eb 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod 777 /home/vcap/app/appdynamics ; ls -la app/ ; chmod 777 /home/vcap/app/appdynamics/logs ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" return () From 38b793470741da1eeaf5a68961647ee44cee1f3d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:07:41 -0400 Subject: [PATCH 046/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4a153f5eb..a03b9738c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME ; echo Done" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-testapp $APP_TIERNAME $APP_HOSTNAME ; echo Done" return () From f5a9af65ac4a46c874d18afeaaca3b95ba35a05f Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:22:23 -0400 Subject: [PATCH 047/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a03b9738c..da0702f87 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -163,7 +163,7 @@ def modify_php_ini(self): # exit_code = os.system("echo calling out env; env") # exit_code = os.system("echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") # exit_code = os.system("echo $HOSTNAME") -# exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-machineagentPCF $APP_TIERNAME $APP_HOSTNAME") +# exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 ENV['application_name'] $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") # exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") # exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") exit_code = os.system("echo adding to phpini") From 4545168aebcf0576391dc1950c863b93adae6beb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:28:05 -0400 Subject: [PATCH 048/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index da0702f87..8b120762c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 php-testapp $APP_TIERNAME $APP_HOSTNAME ; echo Done" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 ENV['application_name'] $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From d85b208760d130bcf1b8200b9e9635db1cd6217a Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:30:17 -0400 Subject: [PATCH 049/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8b120762c..54da1afab 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 ENV['application_name'] $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=ENV['application_name']; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 1f594b147aa25ee930db0fb0a1bd20696ce2f9f1 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:37:06 -0400 Subject: [PATCH 050/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 54da1afab..a4a563146 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=ENV['application_name']; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; export APP_NAME=ENV['application_name']; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 4f60f710726899c9e72fdb42b0b0f5c436185a5b Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:41:08 -0400 Subject: [PATCH 051/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a4a563146..a94594ead 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; export APP_NAME=ENV['application_name']; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6aa00131b4384683c7c33ce3c80d15cade980beb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 10:56:21 -0400 Subject: [PATCH 052/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a94594ead..fec285d09 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 777 /home/vcap/app ; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 86040b85007176f3318fe9fdcb022dac98006d88 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:12:24 -0400 Subject: [PATCH 053/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index fec285d09..dac21fbf6 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From b9d9c080aa2fe3e52be0ddb522aa9b42f7383099 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:16:16 -0400 Subject: [PATCH 054/165] logs --- extensions/appdynamics/extension.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index dac21fbf6..23bdc1718 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,13 +171,10 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands") - #exit_code = os.system("pwd; ls -al; env ; echo VCAP_APPLICATION; echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") - #ctx.add("ADDITIONAL_PREPROCESS_CMDS","env") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = 'echo ${VCAP_APPLICATION} | sed -e "s/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g"' #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 00e0d8672f63d0dab4326eb8f48985cb3949a225 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:20:12 -0400 Subject: [PATCH 055/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 23bdc1718..61cafa184 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6a41ee2ef5606e6222c39c6137841c12e77cfde6 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:31:42 -0400 Subject: [PATCH 056/165] logs --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 61cafa184..6d95f222b 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,8 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From e0a269aa15320ea640cccacf71f77fc06c6f1f28 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:34:25 -0400 Subject: [PATCH 057/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 6d95f222b..66dcca946 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,7 +175,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From cbb9300e316dc2932e97fe393ce566111419dddb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:44:00 -0400 Subject: [PATCH 058/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 66dcca946..181201ac9 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,7 +175,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; sleep 5; ps -auxw; php -i" return () From 075ca444c8ff1c9562f1b516d3faf8fa5bd7197c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 11:55:11 -0400 Subject: [PATCH 059/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 181201ac9..9c19f911f 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,7 +175,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; sleep 5; ps -auxw; php -i" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" return () From c31f1f35aefdaf01aaf39b0bdda4bebcf48ff156 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 12:24:51 -0400 Subject: [PATCH 060/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9c19f911f..a3358ef7f 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,7 +175,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=customer1@helloworld 10.0.32.213 8080 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" return () From 5ece315eda1510090b901b3face717da5249cc1c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 12:28:43 -0400 Subject: [PATCH 061/165] logs --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a3358ef7f..517ba0184 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -175,7 +175,8 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From a5c16095a5d4dbcc9e6da2553a9814250d42c7cc Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 28 Aug 2015 12:31:31 -0400 Subject: [PATCH 062/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 517ba0184..aa1d2899f 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; pwd ; ls -al ; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 1b1996792a13724873cf2b7acd878e801518bd7b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 19:41:22 -0400 Subject: [PATCH 063/165] hostname --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index aa1d2899f..afa9e3be5 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; pwd ; ls -al ; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host_name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo $AD_CONTROLLER; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 4b3258c7afd63c35b99370752576ded5dab8d251 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 19:55:59 -0400 Subject: [PATCH 064/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index afa9e3be5..79891b56d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host_name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo $AD_CONTROLLER; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6b96d84b6df9a33f7bb04fa070dc0f1126b3fe07 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:00:10 -0400 Subject: [PATCH 065/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 79891b56d..ea671cee0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 4090cc1339d52f3931be056fe18c8c1f92d8c485 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:14:46 -0400 Subject: [PATCH 066/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ea671cee0..1577d20ce 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 8a9bab0a5bc7ca032ac838e2a0d2deb317fe6256 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:18:07 -0400 Subject: [PATCH 067/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 1577d20ce..96d108a1e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6b63e65861289b716e9f9db2136c54cfc21f9e4a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:54:01 -0400 Subject: [PATCH 068/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 96d108a1e..2ada54a75 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export ssl-enabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo ssl-enabled $ssl-enabled; if [ $sslenabled == "true" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From ad7fabb756a5b70b11380b550f8541ae6f1f40ca Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:55:59 -0400 Subject: [PATCH 069/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 2ada54a75..df0cc0a24 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export ssl-enabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo ssl-enabled $ssl-enabled; if [ $sslenabled == "true" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export ssl-enabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo ssl-enabled $ssl-enabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From d0f3afdd2beffd8f10ffe33a3ce3e05ef56d4ab4 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 20:59:15 -0400 Subject: [PATCH 070/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index df0cc0a24..753d34411 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export ssl-enabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo ssl-enabled $ssl-enabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6a99633fb85d011b53369867f5c3742364c19ec8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Aug 2015 21:01:54 -0400 Subject: [PATCH 071/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 753d34411..0223e30e2 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 9975aa9432c1029955866cccf92436d8bbe645e8 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 11:29:58 -0400 Subject: [PATCH 072/165] logs --- extensions/appdynamics/extension.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 0223e30e2..b85f65825 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -170,13 +170,8 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): - exit_code = os.system("echo !!! preprocess_commands") - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "export APPDYNAMICS_NODENAME=$(expr \"$VCAP_APPLICATION\" : ''.*instance_index[\": ]*\([[:digit:]]*\).*'') ; echo HI ; echo $APPDYNAMICS_NODENAME" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g' && echo Hello" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; env; echo print appname; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini; echo \"agent.proxy_output = /home/vcap/app/appdynamics/proxy.out\" >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; export APP_NAME=$application_name; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z "application_name" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 3987b0bc4229ff67bd4817e4cf4be27b1a948223 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 11:33:05 -0400 Subject: [PATCH 073/165] logs --- extensions/appdynamics/extension.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index b85f65825..8af2e7a5c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -140,38 +140,11 @@ def should_install(self): return self._detected def modify_php_ini(self): -# with open(self.php_ini_path, 'rt') as php_ini: -# lines = php_ini.readlines() -# extns = [line for line in lines if line.startswith('extension=')] -# if len(extns) > 0: -# pos = lines.index(extns[-1]) + 1 -# else: -# pos = lines.index('#{PHP_EXTENSIONS}\n') + 1 -# lines.insert(pos, 'extension=%s\n' % self.appdynamics_so) -# lines.append('\n') -# lines.append('[appdynamics]\n') -# lines.append('appdynamics.license=%s\n' % self.license_key) -# lines.append('appdynamics.appname=%s\n' % self.app_name) -# lines.append('appdynamics.daemon.logfile=%s\n' % self.log_path) -# lines.append('appdynamics.daemon.location=%s\n' % self.daemon_path) -# lines.append('appdynamics.daemon.port=%s\n' % self.socket_path) -# lines.append('appdynamics.daemon.pidfile=%s\n' % self.pid_path) -# with open(self.php_ini_path, 'wt') as php_ini: -# for line in lines: -# php_ini.write(line) -# -# exit_code = os.system("echo calling out env; env") -# exit_code = os.system("echo ${VCAP_APPLICATION} | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'") -# exit_code = os.system("echo $HOSTNAME") -# exit_code = os.system("ps -auxw; cd /home/vcap; chmod -R 755 ./app; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh -s -i ./app/appdynamics/phpini -a=appdynamics@bb6604c1-fbe0-400a-a76b-87c26254fe5e 54.245.245.19 443 ENV['application_name'] $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") -# exit_code = os.system("echo sleep 5; sleep 5; ps -auxw; php -i") -# exit_code = os.system("echo adding to phpini; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini") - exit_code = os.system("echo adding to phpini") # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z "application_name" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From aed49abe0f954f3de6575d0527b923a74a09d314 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 11:35:15 -0400 Subject: [PATCH 074/165] logs --- extensions/appdynamics/extension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8af2e7a5c..3b0703682 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -140,6 +140,7 @@ def should_install(self): return self._detected def modify_php_ini(self): + exit_code = os.system("done modify_php_ini") # Extension Methods def preprocess_commands(ctx): From fb3501f20c2e182a2052dd8ae1527534d4808b32 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 11:40:17 -0400 Subject: [PATCH 075/165] logs --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 3b0703682..d780dbe56 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -140,12 +140,12 @@ def should_install(self): return self._detected def modify_php_ini(self): - exit_code = os.system("done modify_php_ini") + exit_code = os.system("echo done modify_php_ini") # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_id\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; export APP_HOSTNAME=$APP_TIERNAME`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 71287859a0de9bd7aa974594f33ed8af6554b64a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 11:56:30 -0400 Subject: [PATCH 076/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index d780dbe56..12921f2a4 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; export APP_HOSTNAME=$APP_TIERNAME`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; export APP_HOSTNAME=$APP_TIERNAME`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.:.//g;s/\".*host.*//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 4e7c5713ad21d4e5e0e9a973506b0020be078de1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 12:06:40 -0400 Subject: [PATCH 077/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 12921f2a4..37b3e9a8d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; export APP_HOSTNAME=$APP_TIERNAME`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.:.//g;s/\".*host.*//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 03d4c76517b51e598ee791a59acae5ce9d5a0a04 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Sep 2015 12:08:30 -0400 Subject: [PATCH 078/165] logs --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 37b3e9a8d..896420fd6 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From ee427a3756aef6189420d46df88ec45b9b5e4a95 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 08:52:12 -0400 Subject: [PATCH 079/165] tier name and hostname change --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 896420fd6..9806ef86d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=`echo $VCAP_APPLICATION | sed -e 's/.*instance_index\":\"//g;s/,\"host.*//g;s/\",.*\"//g'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 9f8b2763b2642a59476c409d0986e30f126ba49d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:26:09 -0400 Subject: [PATCH 080/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9806ef86d..42065e727 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z \"application_name\" ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From b284818e932996e7e88e6e14479bcb252f04d0d9 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:30:55 -0400 Subject: [PATCH 081/165] add nodename --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 42065e727..7cd79e5bd 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,8 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From b905ce4eed660e5514c21724cc232e8fa990e73f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:34:45 -0400 Subject: [PATCH 082/165] add nodename --- extensions/appdynamics/extension.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7cd79e5bd..ba20553d5 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,8 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME\-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6c0bcdc253e0bf7fd2734acbc4e3888399f8d0fc Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:36:04 -0400 Subject: [PATCH 083/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ba20553d5..89ee3c209 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME\-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From c1e9fbc7e1deb38eb7b0fa7479c2d65e6357b4b3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:48:51 -0400 Subject: [PATCH 084/165] add nodename --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 89ee3c209..f9211ddbe 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,7 +145,8 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$key'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 33dbb75814b06a4fb0ee7ed4fea8ad383439721e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 09:53:01 -0400 Subject: [PATCH 085/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index f9211ddbe..507c14163 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From c84c2a7588027a70dddf76e2e7ee55508ba83723 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:05:20 -0400 Subject: [PATCH 086/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 507c14163..2d5d5fb81 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From d81f92c506a6cf0856e363441f2e62846aba7538 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:17:34 -0400 Subject: [PATCH 087/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 2d5d5fb81..8e41e461e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:\}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From f17345ffe3b28735955a470f234b24f673a27bc9 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:50:41 -0400 Subject: [PATCH 088/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8e41e461e..e216d37e7 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:\}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From e961c2386e485554b672af8cc8b1855e1468e3f3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:53:33 -0400 Subject: [PATCH 089/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index e216d37e7..9e3b2f97c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From f476dbce3334759d5a803033102dafa1282e5624 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:55:14 -0400 Subject: [PATCH 090/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9e3b2f97c..519d4befe 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '{for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}}}}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From c0005eb7782a91dfccb51c9789306d5691be65f6 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 10:57:27 -0400 Subject: [PATCH 091/165] add nodename --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 519d4befe..4c1328f82 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" '\{for(i=1;i<=NF;i++)\{if($i~/\042'$KEY'\042/)\{print $(i+1)\}\}\}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" 'for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 7ac04b20a647fe4b54c24dceea2dc40cc8bfa732 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 13:43:06 -0400 Subject: [PATCH 092/165] logs --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4c1328f82..eb1a12244 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,8 @@ def modify_php_ini(self): def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" 'for(i=1;i<=NF;i++){if($i~/\042'$KEY'\042/){print $(i+1)}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" 'for(i=1;i<=NF;i++){if$i~/\042'$KEY'\042/){print $(i+1)}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 09552287bbad726c3d7dcee65038e3cdcaa0ddff Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 16:33:10 -0400 Subject: [PATCH 093/165] service name --- extensions/appdynamics/extension.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index eb1a12244..d66004825 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -140,14 +140,15 @@ def should_install(self): return self._detected def modify_php_ini(self): - exit_code = os.system("echo done modify_php_ini") + exit_code = os.system("nothing to do in modify_php_ini") + return exit_code # Extension Methods def preprocess_commands(ctx): - exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`key=instance_index; echo $VCAP_APPLICATION| awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/\042'${key}'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`KEY=instance_index; echo $VCAP_APPLICATION | awk -F\"[,:}}]\" 'for(i=1;i<=NF;i++){if$i~/\042'$KEY'\042/){print $(i+1)}}' | tr -d '\"'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + + if self._detected == true: + exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From bd703cc6878ed3785ff9229253f9f73a72706983 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 16:57:56 -0400 Subject: [PATCH 094/165] service name --- extensions/appdynamics/extension.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index d66004825..689961dd0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -146,7 +146,31 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): - if self._detected == true: + service = ctx.get('VCAP_SERVICES', {}) + service_defs = services.get('appdynamics', []) + detected = False + if len(service_defs) == 0: + #self._log.info("AppDynamics services with tag appdynamics not detected.") + #self._log.info("Looking for tag app-dynamics service.") + service_defs = services.get('app-dynamics', []) + if len(service_defs) == 0: + #self._log.info("AppDynamics services with tag app-dynamics not detected.") + #self._log.info("Looking for Appdynamics user-provided service.") + service_defs = services.get('user-provided', []) + if len(service_defs) == 0: + #self._log.info("AppDynamics services not detected.") + if len(service_defs) > 1: + #self._log.warn("Multiple AppDynamics services found, " + # "credentials from first one.") + if len(service_defs) > 0: + #service = service_defs[0] + #creds = service.get('credentials', {}) + #account_access_key = creds.get('account-access-key', None) + #if self.account_access_key: + # self._log.debug("AppDynamics service detected.") + detected = True + + if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" From 822670e5305f9d2b7cce24f62c4432936f1777f7 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 17:00:12 -0400 Subject: [PATCH 095/165] service name --- extensions/appdynamics/extension.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 689961dd0..a07d90bd6 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -159,16 +159,18 @@ def preprocess_commands(ctx): service_defs = services.get('user-provided', []) if len(service_defs) == 0: #self._log.info("AppDynamics services not detected.") + detected = False if len(service_defs) > 1: #self._log.warn("Multiple AppDynamics services found, " # "credentials from first one.") + detected = False if len(service_defs) > 0: #service = service_defs[0] #creds = service.get('credentials', {}) #account_access_key = creds.get('account-access-key', None) #if self.account_access_key: # self._log.debug("AppDynamics service detected.") - detected = True + detected = True if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") From f699e67692f92265501aa8e75e98576e5d94e1fc Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 17:03:25 -0400 Subject: [PATCH 096/165] service name --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a07d90bd6..3cbd5b2e7 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -147,7 +147,7 @@ def modify_php_ini(self): def preprocess_commands(ctx): service = ctx.get('VCAP_SERVICES', {}) - service_defs = services.get('appdynamics', []) + service_defs = service.get('appdynamics', []) detected = False if len(service_defs) == 0: #self._log.info("AppDynamics services with tag appdynamics not detected.") From 1452fc59b03eb1a44e12d85572b85af2d5b45fbf Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 17:05:56 -0400 Subject: [PATCH 097/165] service name --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 3cbd5b2e7..e4bfad078 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -152,11 +152,11 @@ def preprocess_commands(ctx): if len(service_defs) == 0: #self._log.info("AppDynamics services with tag appdynamics not detected.") #self._log.info("Looking for tag app-dynamics service.") - service_defs = services.get('app-dynamics', []) + service_defs = service.get('app-dynamics', []) if len(service_defs) == 0: #self._log.info("AppDynamics services with tag app-dynamics not detected.") #self._log.info("Looking for Appdynamics user-provided service.") - service_defs = services.get('user-provided', []) + service_defs = service.get('user-provided', []) if len(service_defs) == 0: #self._log.info("AppDynamics services not detected.") detected = False From 93a240cc98b47ef58786e2eb7269112f2e4d5214 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 17:21:29 -0400 Subject: [PATCH 098/165] service name --- extensions/appdynamics/extension.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index e4bfad078..725d5da32 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -150,26 +150,17 @@ def preprocess_commands(ctx): service_defs = service.get('appdynamics', []) detected = False if len(service_defs) == 0: - #self._log.info("AppDynamics services with tag appdynamics not detected.") - #self._log.info("Looking for tag app-dynamics service.") + _log.info("AppDynamics services with tag appdynamics not detected.") + _log.info("Looking for tag app-dynamics service.") service_defs = service.get('app-dynamics', []) if len(service_defs) == 0: - #self._log.info("AppDynamics services with tag app-dynamics not detected.") - #self._log.info("Looking for Appdynamics user-provided service.") + _log.info("AppDynamics services with tag app-dynamics not detected.") + _log.info("Looking for Appdynamics user-provided service.") service_defs = service.get('user-provided', []) if len(service_defs) == 0: - #self._log.info("AppDynamics services not detected.") - detected = False - if len(service_defs) > 1: - #self._log.warn("Multiple AppDynamics services found, " - # "credentials from first one.") - detected = False + _log.info("AppDynamics services not detected.") if len(service_defs) > 0: - #service = service_defs[0] - #creds = service.get('credentials', {}) - #account_access_key = creds.get('account-access-key', None) - #if self.account_access_key: - # self._log.debug("AppDynamics service detected.") + _log.debug("AppDynamics service detected.") detected = True if detected == True: From 994984fe72fe71e500cccee15f70fa4200192c15 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2015 17:35:25 -0400 Subject: [PATCH 099/165] service name --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 725d5da32..30444560a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -159,9 +159,9 @@ def preprocess_commands(ctx): service_defs = service.get('user-provided', []) if len(service_defs) == 0: _log.info("AppDynamics services not detected.") - if len(service_defs) > 0: - _log.debug("AppDynamics service detected.") - detected = True + if len(service_defs) > 0: + _log.debug("AppDynamics service detected.") + detected = True if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") From 2141aaf89f6ab1638c089e86f0e11f9b996a6b65 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:10:11 -0400 Subject: [PATCH 100/165] temp change --- extensions/appdynamics/extension.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 30444560a..c56880be7 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -165,6 +165,8 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] + } ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 6ba4238dd11309d1f4f989a79410955af2865c6e Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:11:59 -0400 Subject: [PATCH 101/165] temp change --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c56880be7..be2a93861 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -166,7 +166,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] - } + #} ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 9c4c20163b07b9a40d1453b539ce229bf7b83385 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:14:53 -0400 Subject: [PATCH 102/165] temp change --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index be2a93861..820829c1a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -140,7 +140,7 @@ def should_install(self): return self._detected def modify_php_ini(self): - exit_code = os.system("nothing to do in modify_php_ini") + exit_code = os.system("echo AppDynamics extension: nothing to do in modify_php_ini") return exit_code # Extension Methods @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 76fc756cd65f732edf860bd2bf1f724e085f68eb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:17:41 -0400 Subject: [PATCH 103/165] temp change --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 820829c1a..7d8ce93af 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; ls -al ./app/; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From e321d015a0ae65037f0408edd14f358bfe0d7eb7 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:24:49 -0400 Subject: [PATCH 104/165] temp change --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7d8ce93af..9f5e54b00 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; ls -al ./app/; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; ls -al ./app/; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From adbf736aa1b58d310aef48966bd49e0d11f27dce Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:33:32 -0400 Subject: [PATCH 105/165] temp change --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9f5e54b00..9960a1f48 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; pwd; ls -al ; ls -al ./app/; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g'-tier `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 7946e77c150cfe6df0d0837c5b631fbc027efd80 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:38:12 -0400 Subject: [PATCH 106/165] debug --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9960a1f48..79366a413 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g'-tier `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=${APP_TIERNAME}-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From c14c2c2b9076c26dd20b507005e316d809d9046e Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 12 Oct 2015 12:39:08 -0400 Subject: [PATCH 107/165] debug --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 79366a413..6859f3ae4 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,7 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=${APP_TIERNAME}-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return () From 7acd74082d359247dcb6cd60538fa066d5903128 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 13 Oct 2015 12:17:13 -0400 Subject: [PATCH 108/165] break up cmds --- extensions/appdynamics/extension.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 6859f3ae4..d63f56324 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,7 +167,12 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + + " chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx = { + 'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Cmd String list"', 'env;', 'ls -l' ]] + } return () From 5dde7f252e091e5d15c920165a48bcba549de595 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 13 Oct 2015 12:19:13 -0400 Subject: [PATCH 109/165] break up cmds --- extensions/appdynamics/extension.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index d63f56324..d9a29e2d3 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -168,12 +168,11 @@ def preprocess_commands(ctx): #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - - " chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" ctx = { 'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Cmd String list"', 'env;', 'ls -l' ]] } - + return () def service_commands(ctx): From 0fa7acf980d8482c7e32fe78f0b88082e9551e8e Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 13 Oct 2015 12:21:12 -0400 Subject: [PATCH 110/165] break up cmds --- extensions/appdynamics/extension.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index d9a29e2d3..5dc75d318 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,11 +167,11 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx = { - 'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Cmd String list"', 'env;', 'ls -l' ]] - } + #ctx = { + #'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Cmd String list"', 'env;', 'ls -l' ]] + #} return () From a756a3576609a869a9b12041da340f435be6cb26 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 13 Oct 2015 12:24:42 -0400 Subject: [PATCH 111/165] break up cmds --- extensions/appdynamics/extension.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5dc75d318..06038e27c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -167,11 +167,12 @@ def preprocess_commands(ctx): exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #ctx = { - #'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Cmd String list"', 'env;', 'ls -l' ]] - #} + + ctx = { + 'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Hellooooooooo World!"']] + } return () From 2e0c530bbe480a49bd721020991a5f83a4dc8a11 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Tue, 13 Oct 2015 12:27:17 -0400 Subject: [PATCH 112/165] break up cmds --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 06038e27c..2d2c65f17 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,7 @@ def preprocess_commands(ctx): #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" ctx = { - 'ADDITIONAL_PREPROCESS_CMDS': [['echo', '"Hellooooooooo World!"']] + 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] } return () From b68e3ef7fc353d078daa8cac3afa7cd12a512a00 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 08:47:38 -0400 Subject: [PATCH 113/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 2d2c65f17..915321188 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,9 @@ def preprocess_commands(ctx): 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] } - return () + return (('echo','" in preprocess"', 'env', 'ls')) + + #return () def service_commands(ctx): return {} From 4ae220de86bd117d60eaf0133820218e31a0f1c0 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 08:50:24 -0400 Subject: [PATCH 114/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 915321188..cf2c029e8 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -170,9 +170,9 @@ def preprocess_commands(ctx): #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - ctx = { - 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] - } + #ctx = { + # 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] + #} return (('echo','" in preprocess"', 'env', 'ls')) From da02ccb04fa1fc7f2d8df355eed8f04a89efb444 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:21:23 -0400 Subject: [PATCH 115/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index cf2c029e8..7cf2370c0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,7 +174,11 @@ def preprocess_commands(ctx): # 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] #} - return (('echo','" in preprocess"', 'env', 'ls')) + return (( + 'echo', + '" in preprocess"', + 'env', + 'ls'),) #return () From 45274cde1b8a66a81997589fa178bddc12216971 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:23:41 -0400 Subject: [PATCH 116/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7cf2370c0..7a4e868a0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): return (( 'echo', - '" in preprocess"', + '" in preprocess;"', 'env', 'ls'),) From 9acd2c4e58b82beed4d0e6e1f978d5cf4403cbf4 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:29:30 -0400 Subject: [PATCH 117/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7a4e868a0..c9b2b5b09 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,11 +174,10 @@ def preprocess_commands(ctx): # 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] #} - return (( - 'echo', - '" in preprocess;"', - 'env', - 'ls'),) + return [ + [ 'echo', '" in preprocess;"'], + ['env'], + ['ls']] #return () From e824d801a57a1bb31292499ca82cf2a05c7b95a5 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:36:23 -0400 Subject: [PATCH 118/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c9b2b5b09..af6d396cc 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -168,7 +168,7 @@ def preprocess_commands(ctx): #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #" chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #" export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" #ctx = { # 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] @@ -177,7 +177,11 @@ def preprocess_commands(ctx): return [ [ 'echo', '" in preprocess;"'], ['env'], - ['ls']] + [ 'chmod', '" -R 755 /home/vcap/app"'], + [ 'chmod', '" 777 ./app/appdynamics/appdynamics-php-agent/logs"'], + [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `"'], + [ 'echo', '" done preprocess;"'], + ['env']] #return () From f6f02bcfa1ad9207ebed5d00aad56c1228b3f564 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:37:55 -0400 Subject: [PATCH 119/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index af6d396cc..b7f8df23a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -179,7 +179,7 @@ def preprocess_commands(ctx): ['env'], [ 'chmod', '" -R 755 /home/vcap/app"'], [ 'chmod', '" 777 ./app/appdynamics/appdynamics-php-agent/logs"'], - [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `"'], + [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `"'], [ 'echo', '" done preprocess;"'], ['env']] From 8805f30c01f973d90241ae71068a0d72ee109efb Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 14 Oct 2015 09:46:03 -0400 Subject: [PATCH 120/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index b7f8df23a..99d306605 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -168,11 +168,7 @@ def preprocess_commands(ctx): #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #" export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - - #ctx = { - # 'ADDITIONAL_PREPROCESS_CMDS': ['env', 'ls -al'] - #} + #" if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return [ [ 'echo', '" in preprocess;"'], @@ -180,6 +176,7 @@ def preprocess_commands(ctx): [ 'chmod', '" -R 755 /home/vcap/app"'], [ 'chmod', '" 777 ./app/appdynamics/appdynamics-php-agent/logs"'], [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `"'], + ['"if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi"'], [ 'echo', '" done preprocess;"'], ['env']] From 83651bbb63a46d12dc90b68c8538ce4ca6d513e1 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:10:48 -0400 Subject: [PATCH 121/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 99d306605..606757a6c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,7 @@ def preprocess_commands(ctx): return [ [ 'echo', '" in preprocess;"'], ['env'], - [ 'chmod', '" -R 755 /home/vcap/app"'], + [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', '" 777 ./app/appdynamics/appdynamics-php-agent/logs"'], [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `"'], ['"if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi"'], From 2bbbb7c57dc46820553004cf299021ba42d4edf8 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:12:40 -0400 Subject: [PATCH 122/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 606757a6c..9062b0a88 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -174,9 +174,9 @@ def preprocess_commands(ctx): [ 'echo', '" in preprocess;"'], ['env'], [ 'chmod', ' -R 755 /home/vcap/app'], - [ 'chmod', '" 777 ./app/appdynamics/appdynamics-php-agent/logs"'], - [ 'export', '"APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `"'], - ['"if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi"'], + [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], + [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + ['if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], [ 'echo', '" done preprocess;"'], ['env']] From fcdbf4a8db1ac79e514f9e0af6df9e85a3ebe437 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:25:22 -0400 Subject: [PATCH 123/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 9062b0a88..5dd932668 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -168,7 +168,7 @@ def preprocess_commands(ctx): #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] #} #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #" if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + #" export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" return [ [ 'echo', '" in preprocess;"'], @@ -176,7 +176,16 @@ def preprocess_commands(ctx): [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - ['if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' `], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' `], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], [ 'echo', '" done preprocess;"'], ['env']] From e8d68b6589b8cca08bd72e597bfb3284d2fd5ecf Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:26:37 -0400 Subject: [PATCH 124/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5dd932668..c1b019a94 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//'`], [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `], [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' `], From 3d9aa98eef52ab4749e1454b21b303992c756711 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:27:43 -0400 Subject: [PATCH 125/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c1b019a94..a327e029d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,7 +176,7 @@ def preprocess_commands(ctx): [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//'`], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `], [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' `], From fa022636d3482d517b12cbcb55086b2cf508416d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:29:12 -0400 Subject: [PATCH 126/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a327e029d..7ae4b3605 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,9 +177,9 @@ def preprocess_commands(ctx): [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], - [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `], - [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `], - [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' `], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' `], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `], [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], From d2c1e0105ffb79c647a211f7f1114d4af95230b8 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 06:30:24 -0400 Subject: [PATCH 127/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7ae4b3605..910ce215a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -180,8 +180,8 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], - [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' `], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `'], [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 91af594dcccbf2f577c02ec49758709216dfab32 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 10:10:38 -0400 Subject: [PATCH 128/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 910ce215a..fe72e8791 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -176,13 +176,13 @@ def preprocess_commands(ctx): [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `'], - [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], From b244e2dc8e133931d46cb5a069bb2552f379fe4d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 10:26:36 -0400 Subject: [PATCH 129/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 45 ++++++++++++----------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index fe72e8791..0a2ce12e0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -165,31 +165,24 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - #ctx = {'ADDITIONAL_PREPROCESS_CMDS': ['env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'] - #} - #ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/appdynamics-php-agent/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - #" export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - - return [ - [ 'echo', '" in preprocess;"'], - ['env'], - [ 'chmod', ' -R 755 /home/vcap/app'], - [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], - [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], - [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], - [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], - [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], - [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `'], - [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], - [ 'echo', '" done preprocess;"'], - ['env']] - - #return () + return [ + [ 'echo', '" in preprocess;"'], + ['env'], + [ 'chmod', ' -R 755 /home/vcap/app'], + [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], + [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `'], + [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], + [ 'echo', '" done preprocess;"'], + ['env']] def service_commands(ctx): return {} @@ -205,7 +198,5 @@ def compile(install): if appdynamics.should_install(): _log.info("Installing AppDynamics") install.package('APPDYNAMICS') - _log.info("Configuring AppDynamics in php.ini") - appdynamics.modify_php_ini() _log.info("AppDynamics Installed.") return 0 From 3bbaf14cf01ea2db4fafd0d3b7ab77b7e54d8b2d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 10:55:15 -0400 Subject: [PATCH 130/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 0a2ce12e0..6c61da577 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [$sslenabled] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], From de74bcda0d6f7a920c585f512a6705b75f7b5493 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 10:56:43 -0400 Subject: [PATCH 131/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 6c61da577..e98618586 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [$sslenabled] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], From 0710c141f728e5fc0544e76915f10659b4361d44 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 11:47:22 -0400 Subject: [PATCH 132/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index e98618586..ad6f3589c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -181,6 +181,7 @@ def preprocess_commands(ctx): [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], + [ 'echo $sslflag'], [ 'echo', '" done preprocess;"'], ['env']] From 0c7888c55d3d8148203a8156314ed7b986f16a36 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:04:37 -0400 Subject: [PATCH 133/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ad6f3589c..b8a0f4539 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,11 +178,12 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], + [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], [ 'echo $sslflag'], - [ 'echo', '" done preprocess;"'], + [ 'echo', '"done preprocess"'], ['env']] def service_commands(ctx): From fb99124d64296522e6a970c5d446cfef539e0e2e Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:06:11 -0400 Subject: [PATCH 134/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index b8a0f4539..5bf494acb 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled ] && [ $sslenabled=="true" ] ; then export sslflag=-s ; fi; `'], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 09852fa050d3e9a7fc211f5a36b0d7199d9a7639 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:10:18 -0400 Subject: [PATCH 135/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5bf494acb..7828703f5 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,8 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'; if [ $sslenabled ] && [ $sslenabled=="true" ] ; then export sslflag=-s ; fi; `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'] + [ 'if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From bc388984d777946aee1c4aebcd85724a55824af7 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:12:43 -0400 Subject: [PATCH 136/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7828703f5..8ff6115fe 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,8 +177,8 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'] - [ 'if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] + [ 'if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From f8753f06a07e8f6a1d7ca744250f35e67f3e0e7a Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:15:22 -0400 Subject: [PATCH 137/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8ff6115fe..4e46f5c93 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] - [ 'if [ $sslenabled ] && [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled ] && [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From ef8baa3eaa4b2b8856de2167a2983ae13152cddd Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:16:55 -0400 Subject: [PATCH 138/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4e46f5c93..7d08ecb93 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] - [ 'if [ $sslenabled ] && [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 3ad53398cc1ceaec6e1918d3f2daa4a22fca1fa8 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:17:38 -0400 Subject: [PATCH 139/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 7d08ecb93..4330cbfa2 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] - [ 'if [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From f5637f819066eb59fc0d69a94f274845311c097c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:24:00 -0400 Subject: [PATCH 140/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 4330cbfa2..1464e787d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] - [ 'if [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled=\"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 2ce6fd13c4ebcd287b7d49fa2c2d73e7c1f3432b Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:24:57 -0400 Subject: [PATCH 141/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 1464e787d..8ffd403df 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -177,7 +177,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'] + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], [ 'if [ $sslenabled=\"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], From b4948c7ea3a97bd67ae13f07f3a695ec0080ebbc Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:30:01 -0400 Subject: [PATCH 142/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8ffd403df..f7b740ba7 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled=\"true\" ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 2bb5ae1dfba227c0412f4e20d9b02f62cd911b23 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:32:02 -0400 Subject: [PATCH 143/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index f7b740ba7..6ef30af3c 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled==true ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From a3400af7b3118a6ef23d18e9202b25e724c5b821 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:40:30 -0400 Subject: [PATCH 144/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 6ef30af3c..0d3f3046d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -178,7 +178,7 @@ def preprocess_commands(ctx): [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled==\"true\" ] ; then export sslflag=-s ; fi; '], + [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], [ 'echo sslflag set to $sslflag' ], [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], From 99e5d68c7869cc29d7727b099893e6ef18a131ed Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Thu, 15 Oct 2015 12:47:05 -0400 Subject: [PATCH 145/165] avoid use of ADDITIONAL_PREPROCESS_CMDS since its not supported for extensions --- extensions/appdynamics/extension.py | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 0d3f3046d..8b137bc95 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -183,7 +183,6 @@ def preprocess_commands(ctx): [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], - [ 'echo $sslflag'], [ 'echo', '"done preprocess"'], ['env']] From 41e6dde715b1a972d317f6094b24aea569a491b7 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 16 Oct 2015 09:16:11 -0400 Subject: [PATCH 146/165] modified uri for agent download --- extensions/appdynamics/extension.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 8b137bc95..a365b4c32 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -25,11 +25,11 @@ DEFAULTS = { - 'APPDYNAMICS_HOST': 's3-us-west-2.amazonaws.com/niksappd', - 'APPDYNAMICS_VERSION': '4.1.1.0', - 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', - 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' - 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', + 'APPDYNAMICS_HOST': 'packages.appdynamics.com', + 'APPDYNAMICS_VERSION': '4.1.5.0', + 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', + 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' + 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', } From 09fda72e0b5b5ca6662479454221dc9ee62b6445 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 16 Oct 2015 09:20:02 -0400 Subject: [PATCH 147/165] modified uri for agent download --- extensions/appdynamics/extension.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a365b4c32..ed08e8b7d 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -25,11 +25,16 @@ DEFAULTS = { - 'APPDYNAMICS_HOST': 'packages.appdynamics.com', - 'APPDYNAMICS_VERSION': '4.1.5.0', - 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', - 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' - 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', + 'APPDYNAMICS_HOST': 's3-us-west-2.amazonaws.com/niksappd', + 'APPDYNAMICS_VERSION': '4.1.1.0', + 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', + 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' + 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', + #'APPDYNAMICS_HOST': 'packages.appdynamics.com', + #'APPDYNAMICS_VERSION': '4.1.5.0', + #'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', + #'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' + # 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', } From 3bd6c6e99d2b991299dc5bbdc18e7c3e4c607b93 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 16 Oct 2015 09:23:42 -0400 Subject: [PATCH 148/165] modified uri for agent download --- extensions/appdynamics/extension.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index ed08e8b7d..07b5be739 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -30,13 +30,14 @@ 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', - #'APPDYNAMICS_HOST': 'packages.appdynamics.com', - #'APPDYNAMICS_VERSION': '4.1.5.0', - #'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', - #'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' - # 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', } +#'APPDYNAMICS_HOST': 'packages.appdynamics.com', +#'APPDYNAMICS_VERSION': '4.1.5.0', +#'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', +#'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' +# 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', + class AppDynamicsInstaller(object): def __init__(self, ctx): From 44bd0d5894270b301190e3f777b30b63b21da9c6 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Fri, 16 Oct 2015 09:31:53 -0400 Subject: [PATCH 149/165] modified uri for agent download --- extensions/appdynamics/extension.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 07b5be739..5b18c54b0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,26 +171,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [ - [ 'echo', '" in preprocess;"'], - ['env'], - [ 'chmod', ' -R 755 /home/vcap/app'], - [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], - [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], - [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], - [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], - [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], - [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], - [ 'echo sslflag set to $sslflag' ], - [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], - [ 'echo', '"done preprocess"'], - ['env']] + return {} def service_commands(ctx): return {} From 19930649bae3475ee13df32aed34abe172c5ce01 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 06:44:18 -0400 Subject: [PATCH 150/165] modified uri for agent download --- extensions/appdynamics/extension.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 5b18c54b0..c8beba9e8 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -171,7 +171,26 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return {} + return [ + [ 'echo', '" in preprocess;"'], + ['env'], + [ 'chmod', ' -R 755 /home/vcap/app'], + [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], + [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], + [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], + [ 'echo sslflag set to $sslflag' ], + [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], + [ 'echo', '"done preprocess"'], + ['env']] def service_commands(ctx): return {} @@ -180,7 +199,6 @@ def service_commands(ctx): def service_environment(ctx): return {} - def compile(install): exit_code = os.system("echo !!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) From d86fde37e0035d9bd9bf597dd90e86427d8f0114 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:02:41 -0400 Subject: [PATCH 151/165] modified uri for agent download --- extensions/appdynamics/extension.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index c8beba9e8..f785aed3e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -202,8 +202,11 @@ def service_environment(ctx): def compile(install): exit_code = os.system("echo !!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) + exit_code = os.system("echo !!!! done compile ") if appdynamics.should_install(): _log.info("Installing AppDynamics") install.package('APPDYNAMICS') _log.info("AppDynamics Installed.") + appdynamics.modify_php_ini() + _log.info("AppDynamics Installed.") return 0 From 964a40ceed1f2d633f988dc16c16d4ba18769d01 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:04:36 -0400 Subject: [PATCH 152/165] modified uri for agent download --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index f785aed3e..803684667 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -202,11 +202,11 @@ def service_environment(ctx): def compile(install): exit_code = os.system("echo !!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) - exit_code = os.system("echo !!!! done compile ") if appdynamics.should_install(): _log.info("Installing AppDynamics") install.package('APPDYNAMICS') _log.info("AppDynamics Installed.") appdynamics.modify_php_ini() _log.info("AppDynamics Installed.") + exit_code = os.system("echo !!!! done compile ") return 0 From 272dd5230d095b143282354f4525164c0928ae19 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:10:19 -0400 Subject: [PATCH 153/165] modified uri for agent download --- extensions/appdynamics/extension.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 803684667..23f3675f4 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -152,6 +152,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): + exit_code = os.system("echo !!!! preprocess ") service = ctx.get('VCAP_SERVICES', {}) service_defs = service.get('appdynamics', []) detected = False @@ -200,7 +201,6 @@ def service_environment(ctx): return {} def compile(install): - exit_code = os.system("echo !!!! compile ") appdynamics = AppDynamicsInstaller(install.builder._ctx) if appdynamics.should_install(): _log.info("Installing AppDynamics") @@ -208,5 +208,4 @@ def compile(install): _log.info("AppDynamics Installed.") appdynamics.modify_php_ini() _log.info("AppDynamics Installed.") - exit_code = os.system("echo !!!! done compile ") return 0 From 2d37a1eb71043ea74adeebd830802a9c7e3a3bf0 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:18:08 -0400 Subject: [PATCH 154/165] modified uri for agent download --- extensions/appdynamics/extension.py | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 23f3675f4..a33772fc8 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -152,7 +152,6 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): - exit_code = os.system("echo !!!! preprocess ") service = ctx.get('VCAP_SERVICES', {}) service_defs = service.get('appdynamics', []) detected = False @@ -170,28 +169,12 @@ def preprocess_commands(ctx): _log.debug("AppDynamics service detected.") detected = True - if detected == True: - exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [ - [ 'echo', '" in preprocess;"'], - ['env'], - [ 'chmod', ' -R 755 /home/vcap/app'], - [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], - [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], - [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], - [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], - [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], - [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], - [ 'echo sslflag set to $sslflag' ], - [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], - [ 'echo', '"done preprocess"'], - ['env']] + if detected == True: + exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" + + return () + def service_commands(ctx): return {} From a8b68eea685e43df67443b6b0a7353500c64d08c Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:19:39 -0400 Subject: [PATCH 155/165] modified uri for agent download --- extensions/appdynamics/extension.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index a33772fc8..1e7edbf7a 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -152,6 +152,7 @@ def modify_php_ini(self): # Extension Methods def preprocess_commands(ctx): + exit_code = os.system("echo !!!! preprocess ") service = ctx.get('VCAP_SERVICES', {}) service_defs = service.get('appdynamics', []) detected = False @@ -169,12 +170,27 @@ def preprocess_commands(ctx): _log.debug("AppDynamics service detected.") detected = True - if detected == True: - exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - ctx['ADDITIONAL_PREPROCESS_CMDS'] = "env ; chmod -R 755 /home/vcap/app ; chmod 777 ./app/appdynamics/logs; export APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e 's/.*application_name.:.//g;s/\".*application_uri.*//g' `; if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME; else export APP_NAME=$application_name; fi;export APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e 's/.*instance_index.://g;s/\".*host.*//g' | sed 's/,//'`; echo APP_NAME $APP_NAME; echo APP_TIERNAME $APP_TIERNAME; echo APP_HOSTNAME $APP_HOSTNAME; export AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e 's/.*account-name.:.//g;s/\".*port.*//g' `; echo AD_ACCOUNT_NAME $AD_ACCOUNT_NAME; export AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e 's/.*account-access-key.:.//g;s/\".*host-name.*//g' `; echo AD_ACCOUNT_ACCESS_KEY $AD_ACCOUNT_ACCESS_KEY; export AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e 's/.*host-name.:.//g;s/\".*ssl-enabled.*//g' ` ; echo AD_CONTROLLER $AD_CONTROLLER; export AD_PORT=`echo $VCAP_SERVICES | sed -e 's/.*port.:.//g;s/\".*account-access-key.*//g' ` ; echo AD_PORT $AD_PORT; export sslenabled=`echo $VCAP_SERVICES | sed -e 's/.*ssl-enabled.:.//g;s/\".*.*//g' `; echo sslenabled $sslenabled; if [ $sslenabled == \"true\" ] ; then export sslflag=\-s ; fi; PATH=$PATH:./app/php/bin/ ./app/appdynamics/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME ; cat /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini" - - return () - + if detected == True: + exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + return [[ 'echo', '" in preprocess;"'], + ['env'], + [ 'chmod', ' -R 755 /home/vcap/app'], + [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], + [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], + [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], + [ 'echo sslflag set to $sslflag' ], + [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], + [ 'echo', '"done preprocess"'], + ['env']] def service_commands(ctx): return {} From 68edde73ec2c53682f076b63a509f1c7bc814952 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 07:23:30 -0400 Subject: [PATCH 156/165] modified uri for agent download --- extensions/appdynamics/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 1e7edbf7a..f47818ed9 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,7 +172,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [[ 'echo', '" in preprocess;"'], + return {[[ 'echo', '" in preprocess;"'], ['env'], [ 'chmod', ' -R 755 /home/vcap/app'], [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], @@ -190,7 +190,7 @@ def preprocess_commands(ctx): [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], [ 'echo', '"done preprocess"'], - ['env']] + ['env']]} def service_commands(ctx): return {} From b88f396e3d121831e29840e77f31227fcf7106c6 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:09:48 -0400 Subject: [PATCH 157/165] modified uri for agent download --- extensions/appdynamics/extension.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index f47818ed9..bae2cf19e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,25 +172,9 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return {[[ 'echo', '" in preprocess;"'], + return [[ 'echo', '" in preprocess;"'], ['env'], - [ 'chmod', ' -R 755 /home/vcap/app'], - [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], - [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], - [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], - [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], - [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], - [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], - [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], - [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], - [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], - [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], - [ 'echo sslflag set to $sslflag' ], - [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], - [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], - [ 'echo', '"done preprocess"'], - ['env']]} + ['env']] def service_commands(ctx): return {} From 86ca8f1a4e1ad59da294703ac8fc3e9684021360 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:10:35 -0400 Subject: [PATCH 158/165] modified uri for agent download --- extensions/appdynamics/extension.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index bae2cf19e..1b1998df0 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,8 +172,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [[ 'echo', '" in preprocess;"'], - ['env'], + return [ ['env'], ['env']] def service_commands(ctx): From 77dab059263d7df53b217a4ad76f922e73fe737b Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:15:47 -0400 Subject: [PATCH 159/165] modified uri for agent download --- extensions/appdynamics/extension.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 1b1998df0..bc737a39e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,8 +172,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [ ['env'], - ['env']] + return [[ 'echo', '" in preprocess;"']] def service_commands(ctx): return {} From 653dcc5588bcad7a4ab9dabff6b01f470467a84d Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:18:55 -0400 Subject: [PATCH 160/165] modified uri for agent download --- extensions/appdynamics/extension.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index bc737a39e..517e2d940 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,7 +172,8 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [[ 'echo', '" in preprocess;"']] + + return () def service_commands(ctx): return {} From 4640ddaf7586d6c1fed870caed96678f312c38ca Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:20:07 -0400 Subject: [PATCH 161/165] modified uri for agent download --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 517e2d940..661004a07 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return () + return [[ 'echo', '" in preprocess;"'] def service_commands(ctx): return {} From f346fd538a0ee929644978ffe2722107432ad921 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:21:06 -0400 Subject: [PATCH 162/165] modified uri for agent download --- extensions/appdynamics/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 661004a07..3b556509e 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -173,7 +173,7 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - return [[ 'echo', '" in preprocess;"'] + return [[ 'echo'], ['" in preprocess;"']] def service_commands(ctx): return {} From 99f94eff56df02d0f73986a9beeb0ea008ae381a Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:24:49 -0400 Subject: [PATCH 163/165] modified uri for agent download --- extensions/appdynamics/extension.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 3b556509e..791c38621 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -172,8 +172,27 @@ def preprocess_commands(ctx): if detected == True: exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") - - return [[ 'echo'], ['" in preprocess;"']] + return [[ 'echo', '" in preprocess;"'], + ['env'], + [ 'chmod', ' -R 755 /home/vcap/app'], + [ 'chmod', ' 777 ./app/appdynamics/appdynamics-php-agent/logs'], + [ 'export', ' APP_TIERNAME=`echo $VCAP_APPLICATION | sed -e \'s/.*application_name.:.//g;s/\".*application_uri.*//g\' `'], + [ 'if [ -z $application_name ]; then export APP_NAME=$APP_TIERNAME && APP_TIERNAME=$APP_TIERNAME-tier; else export APP_NAME=$application_name; fi'], + [ 'export', ' APP_HOSTNAME=$APP_TIERNAME-`echo $VCAP_APPLICATION | sed -e \'s/.*instance_index.://g;s/\".*host.*//g\' | sed \'s/,//\' `'], + [ 'export', ' AD_ACCOUNT_NAME=`echo $VCAP_SERVICES | sed -e \'s/.*account-name.:.//g;s/\".*port.*//g\' `'], + [ 'export', ' AD_ACCOUNT_ACCESS_KEY=`echo $VCAP_SERVICES | sed -e \'s/.*account-access-key.:.//g;s/\".*host-name.*//g\' `'], + [ 'export', ' AD_CONTROLLER=`echo $VCAP_SERVICES | sed -e \'s/.*host-name.:.//g;s/\".*ssl-enabled.*//g\' `'], + [ 'export', ' AD_PORT=`echo $VCAP_SERVICES | sed -e \'s/.*port.:.//g;s/\".*account-access-key.*//g\' `'], + [ 'export', ' sslenabled=`echo $VCAP_SERVICES | sed -e \'s/.*ssl-enabled.:.//g;s/\".*.*//g\'`'], + [ 'if [ $sslenabled == \"true\" ] ; then export sslflag=-s ; fi; '], + [ 'echo sslflag set to $sslflag' ], + [ 'PATH=$PATH:./app/php/bin/ ./app/appdynamics/appdynamics-php-agent/install.sh $sslflag -i ./app/appdynamics/phpini -a=$AD_ACCOUNT_NAME@$AD_ACCOUNT_ACCESS_KEY $AD_CONTROLLER $AD_PORT $APP_NAME $APP_TIERNAME $APP_HOSTNAME' ], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini >> /home/vcap/app/php/etc/php.ini'], + [ 'cat', ' /home/vcap/app/appdynamics/phpini/appdynamics_agent.ini'], + [ 'echo', '"done preprocess"'], + ['env']] + else: + return () def service_commands(ctx): return {} From 11e43ce21a3575e730956edfa0838597ec568e35 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Mon, 19 Oct 2015 08:30:17 -0400 Subject: [PATCH 164/165] modified uri for agent download --- extensions/appdynamics/extension.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 791c38621..1924da422 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -145,14 +145,9 @@ def _parse_php_api(self): def should_install(self): return self._detected - def modify_php_ini(self): - exit_code = os.system("echo AppDynamics extension: nothing to do in modify_php_ini") - return exit_code - # Extension Methods def preprocess_commands(ctx): - exit_code = os.system("echo !!!! preprocess ") service = ctx.get('VCAP_SERVICES', {}) service_defs = service.get('appdynamics', []) detected = False @@ -171,7 +166,7 @@ def preprocess_commands(ctx): detected = True if detected == True: - exit_code = os.system("echo !!! preprocess_commands: AppDynamics agent configuration") + exit_code = os.system("echo preprocess_commands: AppDynamics agent configuration") return [[ 'echo', '" in preprocess;"'], ['env'], [ 'chmod', ' -R 755 /home/vcap/app'], @@ -207,6 +202,4 @@ def compile(install): _log.info("Installing AppDynamics") install.package('APPDYNAMICS') _log.info("AppDynamics Installed.") - appdynamics.modify_php_ini() - _log.info("AppDynamics Installed.") return 0 From 623f7c56462b777fdf22bdfa62be0ef737a52c11 Mon Sep 17 00:00:00 2001 From: Sri Dharmasanam Date: Wed, 28 Oct 2015 01:40:55 -0400 Subject: [PATCH 165/165] add handling for cups svc --- extensions/appdynamics/extension.py | 36 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/extensions/appdynamics/extension.py b/extensions/appdynamics/extension.py index 1924da422..03ac79957 100644 --- a/extensions/appdynamics/extension.py +++ b/extensions/appdynamics/extension.py @@ -24,21 +24,22 @@ _log = logging.getLogger('appdynamics') +#DEFAULTS = { +# 'APPDYNAMICS_HOST': 's3-us-west-2.amazonaws.com/niksappd', +# 'APPDYNAMICS_VERSION': '4.1.1.0', +# 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', +# 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' +# 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', +#} + DEFAULTS = { - 'APPDYNAMICS_HOST': 's3-us-west-2.amazonaws.com/niksappd', - 'APPDYNAMICS_VERSION': '4.1.1.0', - 'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.gz', - 'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/php_agent/' - 'archive/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', +'APPDYNAMICS_HOST': 'packages.appdynamics.com', +'APPDYNAMICS_VERSION': '4.1.5.0', +'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', +'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' + 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', } -#'APPDYNAMICS_HOST': 'packages.appdynamics.com', -#'APPDYNAMICS_VERSION': '4.1.5.0', -#'APPDYNAMICS_PACKAGE': 'appdynamics-php-agent-x64-linux-{APPDYNAMICS_VERSION}.tar.bz2', -#'APPDYNAMICS_DOWNLOAD_URL': 'https://{APPDYNAMICS_HOST}/' -# 'php/{APPDYNAMICS_VERSION}/{APPDYNAMICS_PACKAGE}', - - class AppDynamicsInstaller(object): def __init__(self, ctx): self._log = _log @@ -158,9 +159,16 @@ def preprocess_commands(ctx): if len(service_defs) == 0: _log.info("AppDynamics services with tag app-dynamics not detected.") _log.info("Looking for Appdynamics user-provided service.") - service_defs = service.get('user-provided', []) - if len(service_defs) == 0: + cups_service_defs = service.get('user-provided', []) + + if len(cups_service_defs) == 0: _log.info("AppDynamics services not detected.") + else: + cups_svc = cups_service_defs.get('name', []) + if cups_svc == "appdynamics" || cups_svc == "app-dynamics": + _log.info("AppDynamics cups services detected.") + detected = True + if len(service_defs) > 0: _log.debug("AppDynamics service detected.") detected = True