Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos
Commits
f5e5a9c0
Commit
f5e5a9c0
authored
May 29, 2017
by
Hardik Juneja
Committed by
Rafael Monnerat
Jun 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/erp5: Add apachedex for apache logs
parent
897a5592
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
2 deletions
+30
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-0
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+23
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
stack/erp5/buildout.cfg
View file @
f5e5a9c0
...
@@ -463,6 +463,7 @@ eggs = ${neoppod:eggs}
...
@@ -463,6 +463,7 @@ eggs = ${neoppod:eggs}
${scikit-learn:egg}
${scikit-learn:egg}
lock_file
lock_file
astor
astor
APacheDEX
PyStemmer
PyStemmer
PyXML
PyXML
Pympler
Pympler
...
@@ -560,6 +561,7 @@ eggs = ${neoppod:eggs}
...
@@ -560,6 +561,7 @@ eggs = ${neoppod:eggs}
# installation of python, which we don't want on an instance
# installation of python, which we don't want on an instance
interpreter = ${buildout:python}
interpreter = ${buildout:python}
scripts =
scripts =
apachedex
repozo
repozo
runzope
runzope
runzeo
runzeo
...
@@ -608,6 +610,7 @@ eggs +=
...
@@ -608,6 +610,7 @@ eggs +=
scripts +=
scripts +=
is-local-tcp-port-opened
is-local-tcp-port-opened
is-process-older-than-dependency-set
is-process-older-than-dependency-set
runApacheDex
zodbpack
zodbpack
[versions]
[versions]
...
...
stack/erp5/buildout.hash.cfg
View file @
f5e5a9c0
...
@@ -75,7 +75,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
...
@@ -75,7 +75,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
51abbd0cb3e70dc0bca2629ba1a4177a
md5sum =
09862389b2bf3da3f9387a6424329da9
[monitor-template-dummy]
[monitor-template-dummy]
filename = dummy.cfg
filename = dummy.cfg
...
@@ -95,7 +95,7 @@ md5sum = 6a64d1615c3ef9f6311c863d5aa0c58f
...
@@ -95,7 +95,7 @@ md5sum = 6a64d1615c3ef9f6311c863d5aa0c58f
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
3fc9735df6c76bbe1f8505b0be3d5d9f
md5sum =
a3ad32c46bb56076895441edbd66018d
[template-haproxy-cfg]
[template-haproxy-cfg]
filename = haproxy.cfg.in
filename = haproxy.cfg.in
...
...
stack/erp5/instance-balancer.cfg.in
View file @
f5e5a9c0
...
@@ -207,12 +207,34 @@ private = ${:ca-dir}/private
...
@@ -207,12 +207,34 @@ private = ${:ca-dir}/private
certs = ${:ca-dir}/certs
certs = ${:ca-dir}/certs
newcerts = ${:ca-dir}/newcerts
newcerts = ${:ca-dir}/newcerts
crl = ${:ca-dir}/crl
crl = ${:ca-dir}/crl
apachedex = ${monitor-directory:private}/apachedex
[monitor-generate-apachedex-report]
recipe = slapos.cookbook:wrapper
wrapper-path = ${monitor-directory:reports}/${:command}
command-line = "{{ parameter_dict['run-apachedex-location'] }}" "{{ parameter_dict['apachedex-location'] }}" "${directory:apachedex}" --default "${apachedex-parameters:default}" --apache-log-list "${apachedex-parameters:apache-log-list}" --base-list "${apachedex-parameters:base-list}" --skip-base-list "${apachedex-parameters:skip-base-list}" --erp5-base-list "${apachedex-parameters:erp5-base-list}"
command = apachedex_every_3_hour
[apachedex-parameters]
default_parameter =
# XXX - Sample log file with curent date: apache_access.log-%(date)s.gz
# which will be equivalent to apache_access.log-20150112.gz if the date is 2015-01-12
apache-log-list = ${apache-conf-parameter-dict:access-log}
default = ${monitor-directory:etc}/apdex_default
base-list = ${monitor-directory:etc}/apdex_base_list
skip-base-list = ${monitor-directory:etc}/apdex_skip_base_list
erp5-base-list = ${monitor-directory:etc}/apdex_erp5_base_list
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port() }}
monitor-httpd-port = {{ next_port() }}
monitor-title = Balancer monitor
monitor-title = Balancer monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
password = {{ slapparameter_dict['monitor-passwd'] }}
instance-configuration =
file apachedex-default ${apachedex-parameters:default}
file apachedex-base-list ${apachedex-parameters:base-list}
file apachedex-skip-base-list ${apachedex-parameters:skip-base-list}
file apachedex-erp5-base-list ${apachedex-parameters:erp5-base-list}
[buildout]
[buildout]
extends =
extends =
...
@@ -221,4 +243,5 @@ extends =
...
@@ -221,4 +243,5 @@ extends =
parts +=
parts +=
publish
publish
logrotate-apache
logrotate-apache
monitor-generate-apachedex-report
{{ part_list | join('\n ') }}
{{ part_list | join('\n ') }}
stack/erp5/instance.cfg.in
View file @
f5e5a9c0
...
@@ -94,6 +94,8 @@ apache = {{ apache_location }}
...
@@ -94,6 +94,8 @@ apache = {{ apache_location }}
openssl = {{ openssl_location }}
openssl = {{ openssl_location }}
haproxy = {{ haproxy_location }}
haproxy = {{ haproxy_location }}
bin-directory = {{ bin_directory }}
bin-directory = {{ bin_directory }}
apachedex-location = {{ bin_directory }}/apachedex
run-apachedex-location = {{ bin_directory }}/runApacheDex
6tunnel = {{ sixtunnel_location }}
6tunnel = {{ sixtunnel_location }}
dash = {{ dash_location }}
dash = {{ dash_location }}
template-haproxy-cfg = {{ template_haproxy_cfg }}
template-haproxy-cfg = {{ template_haproxy_cfg }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment