Merge branch 'master' into 1.0

component/icu/buildout.cfg

@@ -8,7 +8,10 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17
 configure-command = source/configure
-configure-options = --prefix=${:location}
+configure-options =
+  --prefix=${:location}
+  --disable-static
+  --enable-rpath
 
 [icu]
 <= icu4c

component/postgresql/buildout.cfg

@@ -7,31 +7,31 @@ extends =
   ../perl/buildout.cfg
 parts = postgresql
 
-
 [postgresql]
 <= postgresql92
 
-
 [postgresql-common]
 recipe = slapos.recipe.cmmi
-configure-options = --with-openssl
+configure-options =
+  --without-tcl
+  --without-perl
+  --without-python
+  --without-gssapi
+  --without-krb5
+  --without-pam
+  --without-ldap
+  --without-bonjour
+  --with-openssl
+  --without-selinux
+  --with-readline
+  --without-ossp-uuid
+  --without-libxml
+  --without-libxslt
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
 
-
-[postgresql91]
-<= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.1.13/postgresql-9.1.13.tar.bz2
-md5sum = f50e201b4ef7e0581bf32a1a32c9f14c
-configure-options += --with-perl
-
-
 [postgresql92]
 <= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.2.14/postgresql-9.2.14.tar.bz2
-md5sum = ce2e50565983a14995f5dbcd3c35b627
-# ld: .../perl/libs-c/libperl.a(op.o): relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a shared object; recompile with -fPIC
-# .../parts/perl/libs-c/libperl.a: could not read symbols: Bad value
-# (because libperl.a is not compiled with fPIC)
-# -> no --with-perl
+url = http://ftp.postgresql.org/pub/source/v9.2.15/postgresql-9.2.15.tar.bz2
+md5sum = 235b4fc09eff4569a7972be65c449ecc

component/qemu-kvm/buildout.cfg

@@ -43,9 +43,9 @@ environment =
 [debian-amd64-netinst.iso]
 # Download the installer of Debian 8 (Jessie)
 recipe = hexagonit.recipe.download
-url = http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-cd/debian-8.2.0-amd64-netinst.iso
+url = http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-cd/debian-8.3.0-amd64-netinst.iso
 filename = ${:_buildout_section_name_}
-md5sum = 762eb3dfc22f85faf659001ebf270b4f
+md5sum = a9b490b4215d1e72e876b031dafa7184
 download-only = true
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

component/ruby/buildout.cfg

@@ -16,6 +16,7 @@ parts = ruby
 recipe = slapos.recipe.cmmi
 configure-options =
   --enable-shared --enable-rpath --disable-install-doc
+  --with-dbm-type=gdbm_compat
   --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

slapos/recipe/slapconfiguration.py

@@ -68,6 +68,10 @@ class Recipe(object):
         ${storage-configuration:storage-home}
 
   Output:
+    root-instance-title
+      Hosting subscription or root instance title
+    instance-title
+      Title of instance running into this partition
     slap-software-type
       Current partition's software type.
     ipv4
@@ -146,6 +150,12 @@ class Recipe(object):
               pass
           else:
               options[his_key.replace('_', '-')] = value
+      # Get Instance and root instance title or return UNKNOW if not set
+      options['instance-title'] = parameter_dict.pop('instance_title',
+                                                      'UNKNOW Instance')
+      options['root-instance-title'] = parameter_dict.pop('root_instance_title',
+                                                      'UNKNOW')
+
       ipv4_set = set()
       v4_add = ipv4_set.add
       ipv6_set = set()

software/kvm/common.cfg

@@ -90,7 +90,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ac94fdcf8e3db4bdb2dff4478426595d
+md5sum = c597309c00b657db92f8c43e733b1763
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = e72f42d880877a841e87908566c28610
+md5sum = de733ac612bf498199e68d1d6b7d8ac9
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 6e81c08669e164b852bd8d062c620de2
+md5sum = 24a717e6ccadf5708b8d5d82a75a7b25
 download-only = true
 on-update = true
 
@@ -114,7 +114,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = 7564bfbb74e6557e1041e9d6d1bc5d14
+md5sum = c8481ad7ef56b245e89df76cd19242db
 download-only = true
 on-update = true
 
@@ -127,11 +127,12 @@ download-only = true
 on-update = true
 
 [template-kvm-import]
-recipe = slapos.recipe.template
+recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-import.cfg.in
-md5sum = 6835c9309ff4bf4a0efd1850e6c66b24
-output = ${buildout:directory}/template-kvm-import.cfg
+md5sum = 3177381b65b4b95ba29190a6ac03b771
 mode = 0644
+download-only = true
+on-update = true
 
 [template-kvm-import-script]
 recipe = hexagonit.recipe.download
@@ -145,7 +146,7 @@ mode = 0755
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
 mode = 644
-md5sum = c9f13c1f481ed08c75089aef1d3c6981
+md5sum = ff281bf8a8905632b32254622db105b7
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster-input-schema.json

@@ -151,6 +151,18 @@
       "description": "Text content which will be written in a file data of cluster http server. All VM will be able to download that file via the static URL of cluster HTTP server: https://10.0.2.101/FOLDER_HASH/data.",
       "type": "string"
     },
+    "monitor-interface-url": {
+        "title": "Monitor Web Interface URL",
+        "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
+        "type": "string",
+        "format": "uri"
+    },
+    "monitor-cors-domains": {
+        "title": "Monitor CORS domains",
+        "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.",
+        "type": "string",
+        "default": ""
+    },
     "kvm-partition-dict": {
       "title": "kvm instances definition",
       "description": "kvm instances definition",

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -8,6 +8,7 @@
 {% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
 {% set kvm_instance_dict = {} -%}
 {% set kvm_hostname_list = [] -%}
+{% set monitor_url_list = [] -%}
 
 [request-common]
 recipe = slapos.cookbook:request
@@ -71,6 +72,9 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
 config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
 {% endif -%}
 config-enable-monitor = {{ dumps(kvm_parameter_dict.get('enable-monitor', True)) }}
+config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
+config-monitor-username = ${monitor-htpasswd:username}
+config-monitor-password = ${monitor-htpasswd:passwd}
 
 # Enable simple http server on ipv6 so all VMs will access it
 config-document-host = ${apache-conf:ip}
@@ -86,8 +90,9 @@ sla-fw_rejected_sources = {{ rejected_source_list | join(' ') }}
 sla-fw_restricted_access = {{ dumps(slapparameter_dict.get('fw-restricted-access', 'off')) }}
 
 return = 
-  backend-url
   url
+  backend-url
+  monitor-base-url
 {% if str(use_nat).lower() == 'true' -%}
 {%   for port in nat_rules_list -%}
 {{ '  ' }}nat-rule-url-{{ port }}
@@ -99,6 +104,9 @@ return =
 {% do publish_dict.__setitem__('lan-' ~ instance_name, '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% do kvm_hostname_list.append(instance_name ~ ' ' ~ '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% endif -%}
+{% if str(kvm_parameter_dict.get('enable-monitor', 'True')).lower() == 'true' -%}
+{%  do monitor_url_list.append('${' ~ section ~ ':connection-monitor-base-url}') -%}
+{% endif -%}
 {% do publish_dict.__setitem__(instance_name ~ '-backend-url', '${' ~ section ~ ':connection-backend-url}') -%}
 {% do publish_dict.__setitem__(instance_name ~ '-url', '${' ~ section ~ ':connection-url}') -%}
 {% do kvm_instance_dict.__setitem__(instance_name, (use_nat, nat_rules_list)) -%}
@@ -206,14 +214,41 @@ mode = {{ mode }}
 {{ writefile('cluster-data-content', '${directory:webroot}/${hash-code:passwd}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
 {% endif -%}
 
+[monitor-htpasswd]
+recipe = slapos.cookbook:generate.password
+storage-path = ${directory:etc}/.monitor_user
+bytes = 8
+username = admin
+
+[monitor-instance-parameter]
+monitor-httpd-port = 8060
+monitor-title = KVM Cluster Main Instance
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+username = ${monitor-htpasswd:username}
+password = ${monitor-htpasswd:passwd}
+
+[monitor-conf-parameters]
+monitor-url-list +=
+{% for url in monitor_url_list -%}
+{{ '  ' ~ url }}
+{% endfor %}
+private-path-list += 
+  ${directory:webroot}/
+
 [publish]
 recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}
+{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
+{% if monitor_interface_url -%}
+monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
+{%   endif -%}
+
 [buildout]
 extends = 
   {{ template_httpd_cfg }}
+  {{ template_monitor }}
 
 parts = 
   httpd
@@ -221,6 +256,18 @@ parts =
   httpd-promise
   publish
   directory-doc
+
+  monitor-base
+  cron-entry-logrotate
+  certificate-authority
+  monitor-conf
+  start-monitor
+  ca-httpd
+  monitor-httpd-promise
+  monitor-httpd-promise-conf
+  monitor-status2rss-cron-entry
+# End monitor
+
 # Complete parts with sections
   {{ part_list | join('\n  ') }}
  

software/kvm/instance-kvm-export.cfg.jinja2

+{% set monitor = True  -%}
+
+{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'false' -%}
+{%   set monitor = False  -%}
+{% endif -%}
+
 [buildout]
 extends =
   {{ kvm_template }}
@@ -14,6 +20,18 @@ parts +=
   novnc-promise
   cron
   frontend-promise
+{% if monitor -%}
+# monitor parts
+  monitor-base
+  cron-entry-logrotate
+  certificate-authority
+  monitor-conf
+  start-monitor
+  ca-httpd
+  monitor-httpd-promise
+  monitor-httpd-promise-conf
+  monitor-status2rss-cron-entry
+{% endif %}
 
 # Create the exporter executable, which is a simple shell script
 [exporter]

software/kvm/instance-kvm-import.cfg.in

 [buildout]
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
 # Here, we don't need KVM to run to import data, so we don't
 # even extend the kvm instance profile.
-extends = ${pbsready-import:output}
+extends = 
+  {{ pbsready_import_template }}
+{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{{ '  ' ~ template_monitor }}
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
+[resilient-publish-connection-parameter]
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
+
+[monitor-instance-parameter]
+monitor-httpd-port = 8276
+monitor-title = {{ slapparameter_dict.get('name', 'Kvm Resilient clone') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+{%   if slapparameter_dict.get('monitor-username', '') -%}
+username = {{ slapparameter_dict['monitor-username'] }}
+{%   endif -%}
+{%   if slapparameter_dict.get('monitor-password', '') -%}
+password = {{ slapparameter_dict['monitor-password'] }}
+{%   endif -%}
+instance-configuration =
+  raw takeover-url ${resilient-publish-connection-parameter:takeover-url}
+  raw takeover-password ${resilient-publish-connection-parameter:takeover-password}
+{% endif -%}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin
-srv = $${buildout:directory}/srv
-var = $${buildout:directory}/var
-log = $${:var}/log
-scripts = $${:etc}/run
-services = $${:etc}/service
-promises = $${:etc}/promise
-novnc-conf = $${:etc}/novnc
-run = $${:var}/run
-ca-dir = $${:srv}/ssl
-cron-entries = $${:etc}/cron.d
-crontabs = $${:etc}/crontabs
-cronstamps = $${:etc}/cronstamps
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+var = ${buildout:directory}/var
+log = ${:var}/log
+scripts = ${:etc}/run
+services = ${:etc}/service
+promises = ${:etc}/promise
+novnc-conf = ${:etc}/novnc
+run = ${:var}/run
+ca-dir = ${:srv}/ssl
+cron-entries = ${:etc}/cron.d
+crontabs = ${:etc}/crontabs
+cronstamps = ${:etc}/cronstamps
 
 [importer]
 recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
-rendered = $${directory:bin}/$${slap-parameter:namebase}-importer
+template = {{ template_kvm_import }}
+rendered = ${directory:bin}/${slap-parameter:namebase}-importer
 mode = 0700
 # Resilient stack wants a "wrapper" parameter
-wrapper = $${:rendered}
+wrapper = ${:rendered}
 context =
     section directory directory
-    raw zcat_binary ${gzip:location}/bin/zcat
-    raw gzip_binary ${gzip:location}/bin/gzip
+    raw zcat_binary {{ zcat_binary }}
+    raw gzip_binary {{ gzip_binary }}
 
-backup-disk-path = $${directory:backup}/virtual.qcow2
+backup-disk-path = ${directory:backup}/virtual.qcow2

software/kvm/instance-kvm-input-schema.json

@@ -163,6 +163,19 @@
       "type": "boolean",
       "default": true
     },
+    "monitor-interface-url": {
+        "title": "Monitor Web Interface URL",
+        "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
+        "type": "string",
+        "format": "uri",
+        "default": "https://monitor.node.vifib.com"
+    },
+    "monitor-cors-domains": {
+        "title": "Monitor CORS domains",
+        "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.",
+        "type": "string",
+        "default": "monitor.node.vifib.com"
+    },
     "enable-http-server": {
       "title": "Enable local http server",
       "description": "Set if local http server which serve files to the vm should be deployed. If set to true, get file into the vm with URL: http://10.0.2.100/FILE.",

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -4,6 +4,14 @@
 {% import 'replicated' as replicated with context %}
 
 {% set backup_amount = slapparameter_dict.pop('resilient-clone-number', "1")|int + 1 -%}
+{% set monitor_dict = {} -%}
+
+{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
+{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%}
+{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
+{% endif -%}
+{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 
 [buildout]
 eggs-directory = {{ eggs_directory }}
@@ -17,7 +25,21 @@ parts +=
   kvm-frontend-url-promise
   kvm-backend-url-promise
 
-{{ replicated.replicate("kvm", backup_amount, "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict) }}
+{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+extends = {{ template_monitor }}
+
+
+[monitor-htpasswd]
+recipe = slapos.cookbook:generate.password
+storage-path = ${directory:etc}/.monitor_user
+bytes = 8
+username = admin
+
+{%  do monitor_parameter.__setitem__('monitor-username', slapparameter_dict.get('monitor-username', 'admin'))%}
+{%  do monitor_parameter.__setitem__('monitor-password', slapparameter_dict.get('monitor-password', '${monitor-htpasswd:passwd}'))%}
+{% endif -%}
+
+{{ replicated.replicate("kvm", backup_amount, "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict, monitor_parameter_dict=monitor_dict) }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -29,16 +51,28 @@ promises = ${:etc}/promise
 # Note: += doesn't work.
 return =
 # Resilient related parameters
-  url ssh-public-key ssh-url notification-id ip
+  url ssh-public-key ssh-url notification-id ip {{ monitor_return | join(' ') }}
 # KVM related parameters
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip
 
+# XXX Monitoring Main Instane
+[monitor-instance-parameter]
+monitor-httpd-port = 8160
+cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
+
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = ${request-kvm:connection-backend-url}
 url = ${request-kvm:connection-url}
 ipv6 = ${request-kvm:connection-ip}
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
+{% if monitor_interface_url -%}
+monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
+{% endif -%}
 
 [kvm-frontend-url-promise]
 # Check that url parameter is complete

software/kvm/instance-kvm.cfg.jinja2

@@ -316,40 +316,18 @@ port = ${httpd:port}
 {% endif %}
 
 {% if monitor -%}
-[monitor-access-log]
-< = monitor-directory-access
-source = ${directory:log}
 
-[monitor-access-public]
-< = monitor-directory-access
-source = ${directory:public}
-
-[monitor-parameters]
-port = 8026
-
-{% if instance_type == 'cluster' -%}
-# XXX - Set frontend software type to 'custom-personal' by default for cluster instance
-{% set frontend_software_type = 'custom-personal' -%}
-{% endif -%}
-
-[request-monitor-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Monitor {{ slapparameter_dict.get('name', '') }} Frontend
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config-url = ${monitor-parameters:url}
-software-type = {{ slapparameter_dict.get('monitor-frontend-software-type', frontend_software_type) }}
-return = site_url domain
+[monitor-instance-parameter]
+monitor-httpd-port = 8026
+monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
+{%   if slapparameter_dict.get('monitor-username', '') -%}
+username = {{ slapparameter_dict['monitor-username'] }}
+{%   endif -%}
+{%   if slapparameter_dict.get('monitor-password', '') -%}
+password = {{ slapparameter_dict['monitor-password'] }}
+{%   endif -%}
 
-[monitor-frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = ${directory:promises}/monitor_frontend
-url = ${publish-connection-information:monitor_url}
-dash_path = {{ dash_executable_location }}
-curl_path = {{ curl_executable_location }}
-check-secure = 1
 {% endif -%}
 
 [publish-connection-information]
@@ -387,8 +365,14 @@ tap-ipv4 = ${slap-network-information:tap-ipv4}
 {%   endif %}
 {% endif %}
 {% if monitor -%}
-monitor_url = ${request-monitor-frontend:connection-site_url}
-monitor_v6_url = ${monitor-parameters:url}
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
+{%   set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
+{%   if monitor_interface_url -%}
+monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
+{%   endif -%}
 {% endif -%}
 
 {% if use_tap == 'true' and tap_network_dict.has_key('ipv4') -%}
@@ -617,26 +601,18 @@ parts =
 #  kvm-monitor
   cron
   cron-entry-logrotate
-#  cron-entry-monitor
   frontend-promise
 {% if monitor -%}
 # monitor parts
-  cron-entry-monitor
-  cron-entry-rss
-  deploy-index
-  deploy-status-history-cgi
-  deploy-status-cgi
-#  deploy-logfile-cgi
-#  deploy-resource-consumption-monitoring-cgi
-  setup-static-files
-  public-symlink
-  cgi-httpd-wrapper
-  cgi-httpd-graceful-wrapper
-  monitor-promise
-  monitor-instance-log-access
-  monitor-access-log
-  monitor-access-public
-#  monitor-frontend-promise
+  monitor-base
+  cron-entry-logrotate
+  certificate-authority
+  monitor-conf
+  start-monitor
+  ca-httpd
+  monitor-httpd-promise
+  monitor-httpd-promise-conf
+  monitor-status2rss-cron-entry
 {% endif -%}
 # Complete parts with sections
   {{ part_list | join('\n  ') }}

software/kvm/instance.cfg.in

@@ -14,7 +14,7 @@ nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
 
 kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
-kvm-import = ${template-kvm-import:output}
+kvm-import = $${dynamic-template-kvm-import:rendered}
 kvm-export = $${dynamic-template-kvm-export:rendered}
 
 # Used for the test of resiliency. The system wants a "test" software_type.
@@ -69,7 +69,7 @@ extra-context =
   raw logrotate_cfg ${template-logrotate-base:rendered}
   raw template_content ${template-content:location}/${template-content:filename}
   raw template_httpd_cfg ${template-httpd:rendered}
-  raw template_monitor ${monitor-template:output}
+  raw template_monitor ${monitor2-template:rendered}
 
 [dynamic-template-kvm]
 recipe = slapos.recipe.template:jinja2
@@ -100,7 +100,7 @@ context =
     raw template_content ${template-content:location}/${template-content:filename}
     raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
     raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
-    raw template_monitor ${monitor-template:output}
+    raw template_monitor ${monitor2-template:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
@@ -118,6 +118,7 @@ context =
     key eggs_directory buildout:eggs-directory
     key slapparameter_dict slap-configuration:configuration
     raw curl_executable_location ${curl:location}/bin/curl
+    raw template_monitor ${monitor2-template:rendered}
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
 import-list = file parts :template-parts-destination
@@ -136,6 +137,23 @@ context =
     raw template_kvm_export ${template-kvm-export-script:location}/${template-kvm-export-script:filename}
     raw pbsready_export_template ${pbsready-export:output}
     raw gzip_binary ${gzip:location}/bin/gzip
+    key slapparameter_dict slap-configuration:configuration
+mode = 0644
+
+[dynamic-template-kvm-import]
+recipe = slapos.recipe.template:jinja2
+template = ${template-kvm-import:location}/instance-kvm-import.cfg.in
+rendered = $${buildout:directory}/template-kvm-import.cfg
+extensions = jinja2.ext.do
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
+    raw pbsready_import_template ${pbsready-import:output}
+    raw template_monitor ${monitor2-template:rendered}
+    key slapparameter_dict slap-configuration:configuration
+    raw zcat_binary ${gzip:location}/bin/zcat
+    raw gzip_binary ${gzip:location}/bin/gzip
 mode = 0644
 
 [dynamic-template-kvm-resilient-test]

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 61297b0882cc9d674f4099b8abdd413f
+md5sum = 315f8d0e391fbe81e815e143470f1b92
 mode = 0644
 
 [template-runner-import-script]
@@ -69,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = 6c0a0b0bf28cbcb63831a818edbd6a5d
+md5sum = 8ae80f9a9d5523219e1c9065f1cab6d8
 mode = 0644
 
 [template-runner-export-script]
@@ -84,13 +84,13 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 994e355d713f90bcc17e4b54da65f354
+md5sum = 8f4912ca04a650298c3c260689109c2e
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = aa9a99235571729ab93360c4712efa12
+md5sum = 1721ed960ae5b9ae55864bcdc5b1d487
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
@@ -114,7 +114,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/httpd_conf.in
 download-only = true
-md5sum = b5d095f54f714d17dff12c0c5fe4afb7
+md5sum = 21009dac6e9868bed61a669632103830
 filename = httpd_conf.in
 mode = 0644
 
@@ -171,15 +171,6 @@ filename = listener_slapgrid.py.in
 download-only = true
 mode = 0644
 
-[cors-domain-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/template/${:filename}
-download-only = true
-md5sum = d4c564267dd98cd178a890158c52c384
-destination = ${buildout:parts-directory}/monitor-template-cors-domain-cgi
-filename = cors-domain.jinja
-mode = 0644
-
 [monitor-check-webrunner-internal-instance]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
@@ -193,6 +184,7 @@ mode = 0644
 recipe = zc.recipe.egg
 eggs =
   collective.recipe.environment
+  collective.recipe.template
   cns.recipe.symlink
   erp5.util
   lock-file

software/slaprunner/httpd_conf.in

@@ -2,9 +2,9 @@ PidFile "{{ parameters.path_pid }}"
 ServerName example.com
 ServerAdmin someone@email
 
-<IfDefine !MonitorPort>
-  Listen [{{ parameters.global_ip }}]:{{ parameters.monitor_port }}
-  Define MonitorPort
+<IfDefine !HTTPDPort>
+  Listen [{{ parameters.global_ip }}]:{{ parameters.global_port }}
+  Define HTTPDPort
 </IfDefine>
 
 LoadModule unixd_module modules/mod_unixd.so
@@ -16,7 +16,7 @@ LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule mime_module modules/mod_mime.so
-LoadModule cgid_module modules/mod_cgid.so
+#LoadModule cgid_module modules/mod_cgid.so
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule env_module modules/mod_env.so
@@ -28,6 +28,9 @@ LoadModule dav_fs_module modules/mod_dav_fs.so
 LoadModule cache_module modules/mod_cache.so
 LoadModule file_cache_module modules/mod_file_cache.so
 LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule autoindex_module modules/mod_autoindex.so
 
 ErrorLog "{{ parameters.path_error_log }}"
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -51,6 +54,15 @@ Header set Access-Control-Allow-Credentials "true"
 Header set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST"
 Header set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization"
 
+DocumentRoot {{ parameters.runner_home }}/public
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
 Alias /public {{ parameters.runner_home }}/public
 <Directory {{ parameters.runner_home }}/public>
     Order Allow,Deny
@@ -65,23 +77,20 @@ Alias /public {{ parameters.runner_home }}/public
     </Files>
 </Directory>
 
-
-DavLockDB {{ parameters.var_dir }}/DavLock
+DavLockDB {{ parameters.dav_lock }}
 Alias /share {{ parameters.runner_home }}
 <Directory {{ parameters.runner_home }}>
     DirectoryIndex disabled
     DAV On
     Options Indexes FollowSymLinks
     AuthType Basic
-    AuthName "webdav"
-    AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
+    AuthName "Webrunner Dav"
+    AuthUserFile "{{ parameters.htpasswd_file }}"
     <LimitExcept OPTIONS>
         Require valid-user
     </LimitExcept>
 </Directory>
 
-ScriptSock {{ parameters.path_pid }}
-
 SetEnv GIT_HTTP_EXPORT_ALL
 ScriptAlias /git/ {{ parameters.git_http_backend }}/
 ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
@@ -96,7 +105,7 @@ RewriteCond %{REQUEST_URI} /git-receive-pack$
 
         AuthType Basic
         AuthName "Git Access"
-        AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
+        AuthUserFile "{{ parameters.htpasswd_file }}"
         Require valid-user
 </LocationMatch>
 
@@ -107,9 +116,7 @@ RewriteCond %{REQUEST_URI} /git-receive-pack$
 
         AuthType Basic
         AuthName "Git Access"
-        AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
+        AuthUserFile "{{ parameters.htpasswd_file }}"
         Require valid-user
         Satisfy any
 </LocationMatch>
-
-include {{ parameters.cgi_httpd_conf }}

software/slaprunner/instance-resilient.cfg.jinja2

@@ -10,6 +10,10 @@
 {% if number_of_instances > 2 %}
   {% set number_of_instances = 2 %}
 {% endif %}
+{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
+{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%}
+{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
+{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 
 {% import 'parts' as parts %}
 {% import 'replicated' as replicated %}
@@ -24,11 +28,30 @@ parts +=
   {{ parts.replicate("runner", number_of_instances + 1) }}
   publish-connection-information
 
-{{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }}
+[monitor-htpasswd]
+recipe = slapos.cookbook:generate.password
+storage-path = ${directory:etc}/.monitor_user
+bytes = 8
+username = admin
+
+{%  do monitor_parameter.__setitem__('monitor-username', slapparameter_dict.get('monitor-username', 'admin'))%}
+{%  do monitor_parameter.__setitem__('monitor-password', slapparameter_dict.get('monitor-password', '${monitor-htpasswd:passwd}'))%}
+
+{{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict, monitor_parameter_dict=monitor_dict) }}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+
+# XXX Monitoring Main Instane
+[monitor-instance-parameter]
+monitor-httpd-port = 8160
+cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
+
 
 # Bubble up the parameters
 [request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url monitor_backend_url webdav_url public_url git_public_url git_private_url
+return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info webdav_url public_url git_public_url git_private_url {{ monitor_return | join(' ') }}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
@@ -38,12 +61,16 @@ backend_url = ${request-runner:connection-backend_url}
 access_url = ${request-runner:connection-access_url}
 url = ${request-runner:connection-url}
 ssh_command = ${request-runner:connection-ssh_command}
-monitor_url = ${request-runner:connection-monitor_url}
-monitor_backend_url = ${request-runner:connection-monitor_backend_url}
 webdav_url = ${request-runner:connection-webdav_url}
 public_url = ${request-runner:connection-public_url}
 git_public_url = ${request-runner:connection-git_public_url}
 git_private_url = ${request-runner:connection-git_private_url}
+{% for key in monitor_return -%}
+{{ key }} = ${request-runner:connection-{{ key }}}
+{% endfor -%}
+{% if monitor_interface_url -%}
+monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=${request-runner:connection-monitor-url}
+{% endif -%}
 
 [slap-parameter]
 # Default parameters for distributed deployment

software/slaprunner/instance-runner-export.cfg.in

@@ -15,6 +15,8 @@ parts +=
   publish-connection-information
   slaprunner-promise
   slaprunner-frontend-promise
+  apache-httpd-promise
+  httpd-frontend-promise
   slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
@@ -22,33 +24,17 @@ parts +=
   shellinabox
   slapos-cfg
   slapos-repo
-  cron-entry-backup
   cron-entry-prepare-software
   deploy-instance-parameters
+  instance-software
+  instance-software-type
   minishell-cwd
+  bash-profile
   supervisord-wrapper
+  supervisord-promise
+  httpd-graceful-wrapper
 ## Monitoring part
-###Parts to add for monitoring
-  cron
-  certificate-authority
-  cron-entry-monitor
-  cron-entry-rss
-  deploy-index
-  deploy-settings-cgi
-  deploy-status-cgi
-  deploy-status-history-cgi
-  setup-static-files
-  certificate-authority
-  zero-parameters
-  public-symlink
-  cgi-httpd-wrapper
-  cgi-httpd-graceful-wrapper
-  monitor-promise
-  monitor-instance-log-access
-  bash-profile
 ## Monitor for runner
-  monitor-current-log-access
-  monitor-deploy-cors-domain-cgi
   monitor-check-resilient-feed-file
   monitor-check-webrunner-internal-instance
 
@@ -65,8 +51,13 @@ context =
   raw  shell_binary ${dash:location}/bin/dash
   raw  rsync_binary ${rsync:location}/bin/rsync
 
-[monitor-promise]
-url = $${monitor-frontend:config-url}/$${deploy-index-template:filename}
+[monitor-instance-parameter]
+monitor-httpd-port = 8437
+# Pass some parameter to dispay in monitoring interface
+instance-configuration =
+  file recovery-code $${recovery-code:storage-path}
+  httpdcors cors-domain $${slaprunner-httpd-cors:location} $${httpd-graceful-wrapper:output}
+  raw webrunner-url https://$${request-frontend:connection-domain}
 
 # Extends publish section with resilient parameters
 [publish-connection-information]
@@ -75,10 +66,10 @@ url = $${monitor-frontend:config-url}/$${deploy-index-template:filename}
 [monitor-check-resilient-feed-file]
 recipe = slapos.recipe.template:jinja2
 template = ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
-rendered = $${monitor-directory:monitor-custom-scripts}/check-create-resilient-feed-files.py
+rendered = $${monitor-directory:promises}/check-create-resilient-feed-files
 mode = 700
 context =
   key input_feed_directory directory:notifier-feeds
-  key monitor_feed_directory monitor-directory:public-cgi
+  key monitor_feed_directory monitor-directory:public
   raw base_url http://[$${notifier:host}]:$${notifier:port}/get/
   raw python_executable ${buildout:executable}

software/slaprunner/instance-runner-import.cfg.in

@@ -28,29 +28,6 @@ parts +=
   importer-consistency-promise
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
-## Monitoring part
-###Parts to add for monitoring
-  cron
-  certificate-authority
-  cron-entry-monitor
-  cron-entry-rss
-  deploy-index
-  deploy-settings-cgi
-  deploy-status-cgi
-  deploy-status-history-cgi
-  setup-static-files
-  certificate-authority
-  zero-parameters
-  public-symlink
-  cgi-httpd-wrapper
-  cgi-httpd-graceful-wrapper
-  monitor-promise
-  monitor-instance-log-access
-## Monitor for runner
-  monitor-current-log-access
-  monitor-backup-log-access
-## Monitor for import runner
-  monitor-latest-restored-backup
 
 # For the needs of importer, we run the full slaprunner
 # In case both exporter and importer (aka main instance and clone instance)
@@ -95,19 +72,29 @@ mode = 755
 [slap-parameter]
 auto-deploy-instance = false
 auto-deploy = true
+name = Webrunner import
+monitor-cors-domains = 
+monitor-username = $${monitor-htpasswd:username}
+monitor-password = $${monitor-htpasswd:passwd}
 
 [resilient-publish-connection-parameter]
-monitor-url = $${monitor-parameters:url}
+monitor-base-url = $${publish:monitor-base-url}
+monitor-url = $${publish:monitor-url}
+monitor-user = $${publish:monitor-user}
+monitor-password = $${publish:monitor-password}
 
-[monitor-backup-log-access]
-< = monitor-directory-access
-source = $${directory:logrotate-backup}
 
-[monitor-latest-restored-backup]
-recipe = slapos.recipe.template:jinja2
-command = if [ -f $${directory:etc}/.resilient-timestamp ]; then echo "$(date -d @$(cat $${directory:etc}/.resilient-timestamp) +%c)"; else echo "No backup timestamp found"; fi
-rendered = $${monitor-directory:monitoring-cgi}/latest-restored-backup
-template = ${template-wrapper:output}
-mode = 744
-context =
-  key content :command
+[monitor-instance-parameter]
+monitor-httpd-port = 8360
+#monitor-title = $${slap-parameter:name}
+#cors-domains = $${slap-parameter:monitor-cors-domains}
+#username = $${slap-parameter:monitor-username}
+#password = $${slap-parameter:monitor-password}
+# Pass some parameter to dispay in monitoring interface
+instance-configuration =
+  raw takeover-url http://[$${resilient-web-takeover-httpd-configuration-file:listening-ip}]:$${resilient-web-takeover-httpd-configuration-file:listening-port}/
+  raw takeover-password $${resilient-web-takeover-password:passwd}
+
+[monitor-conf-parameters]
+private-path-list += 
+  $${directory:logrotate-backup}

software/slaprunner/instance-runner-input-schema.json

@@ -98,6 +98,19 @@
             "minimum": 9683,
             "exclusiveMinimum": true
         },
+        "monitor-interface-url": {
+            "title": "Monitor Web Interface URL",
+            "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
+            "type": "string",
+            "format": "uri",
+            "default": "https://monitor.node.vifib.com"
+        },
+        "monitor-cors-domains": {
+            "title": "Monitor CORS domains",
+            "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.",
+            "type": "string",
+            "default": "monitor.node.vifib.com"
+        },
         "cpu-usage-ratio": {
             "title": "CPU Usage Ratio",
             "description": "Ratio of the CPU use for compilation, if value is set to n, compilation will use number-of-cpu/n of cpus (need instance restart)",

stack/monitor/README.txt

-* This stack has for purpose to know if all promises, services, custom monitoring scripts went/are ok.
-* The second purpose of this stack is to implement a zero-knowledge feature : it means you can use its control interface to provide the user with sensible data. It can also let the user change some parameters
-* It also provides a web interface, to see which promises, services and custom scripts failed. It also provide a rss feed to easily know the actual state of your instance, and to know when it started to went bad. You can also add your own monitoring scripts, or cgi files (or just files) that you would want to check easily using a web interface.
-
-Implementation :
-----------------
-1/ In the software.cfg of your Software Release, extends the stack
-2/ In the template that will be copied for the buildout in the instance folder (instance.cfg ?), you have to add these parts:
-###Parts to add for monitoring
-  slap-parameters
-  certificate-authority
-  cron
-  cron-entry-monitor
-  cron-entry-rss
-  deploy-index
-  deploy-index-template
-  deploy-monitor-script
-  deploy-rss-script
-  deploy-settings-cgi
-  deploy-status-cgi
-  make-rss
-  monitor-promise
-  setup-static-files
-  certificate-authority
-  public
-  zero-parameters
-  cgi-httpd-wrappers
-  public-symlink
-
-* If you want to add a custom monitoring script, you can write it (in whatever language you wish) and save it in YOUR_INSTANCE_FOLDER/etc/monitor.
-The only thing to know, is that if your script successfully passed, do not return or print nothing. If there is a problem, you can print the explanation on stdout or stderr
-
-* Here are 2 promises that you can add to your instance buildout, to see if it is working (one is ok, not the other) :
-[google-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promise}/google
-url = http://www.google.com
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[failing-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promise}/fail
-url = http://127.0.0.2
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-
-CGI Scripts:
-------------
-This stack also provides a web interface, in wich you can execute custom cgi scripts, or just print files. The web link is provided in the published parameters, as for the password that you have to change as soon as possible
-
-In that interface you will have access to the previous scripts and the RSS feed. You can also add your files/scripts.
-
-For that, there exists a folder /var/cgi-bin. You should see that directory as a tree having of deep 2. In /var/cgi-bin, you must create only folders, which are called categories. In each category, you can then add your own files.
-
-The backend system will automatically render the webpage according to the inside structure of the cgi-bin directory. Moreover, it will also let you access to your scripts only if you are logged in : you do not need do do your own authentication system ! 
-
-
-Notice :
---------
-* /!\A default password is set up at the installation : "passwordtochange". It has to be rewritten in the control interface by the user itself
-* /!\ If you use the recipe zeroknown, never name a parameter "recipe" or "password". 
-* The control interface will let you change the values of the options declared in the [public] section of the config file (see zeroknown recipe). Other section's values will just be printed. These values won't be overwritten by buildout.
-* If you want to allow a user to change a parameter, use the recipe zeroknown, with the buildout section name : "[public]"
-* If you manually change a parameter, it could take some time for the modifications to be applied (at least 1 or 2 slapgrid-cp)
-* If you need to change the port of the web interface of the monitoring stack, just create in your software release file a part called [monitor-parameters] and give the new port value to the parameter "port".

stack/monitor/buildout.cfg

 [buildout]
+# XXX THIS STACK IS A KIND OF FORK OF `stack/monitor`. THIS ONE WAS
+#     CREATED AS A REDESIGNED ONE TO REMOVE UNWANTED FEATURES AND
+#     TO GO FURTHER TO THE GOOD DESIGN DIRECTION. SEE THE README FOR
+#     MORE INFORMATION.
 
 extends =
   ../../component/apache/buildout.cfg
@@ -7,151 +11,176 @@ extends =
   ../../component/dcron/buildout.cfg
   ../../component/openssl/buildout.cfg
 
-parts =
+parts +=
   slapos-cookbook
-  dcron
-  monitor-eggs
+  eggs
   extra-eggs
-  monitor-bin
-  monitor-template
-  rss-bin
+  monitor2-template
 
-[monitor-eggs]
+[monitor-download-base]
+recipe = hexagonit.recipe.download
+download-only = true
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[monitor-web-base]
+<= monitor-download-base
+url = ${:_profile_base_location_}/web/${:filename}
+destination = ${buildout:parts-directory}/monitor-web
+on-update = true
+
+[monitor-template-base]
+<= monitor-download-base
+url = ${:_profile_base_location_}/templates/${:filename}
+
+[monitor-template-script]
+<= monitor-download-base
+url = ${:_profile_base_location_}/scripts/${:filename}
+destination = ${buildout:parts-directory}/monitor-scripts
+on-update = true
+
+[eggs]
 recipe = zc.recipe.egg
-eggs =
+eggs +=
   collective.recipe.template
   cns.recipe.symlink
 
 [extra-eggs]
-recipe = zc.recipe.egg
+<= eggs
 interpreter = pythonwitheggs
-eggs =
+eggs +=
+  psutil
   PyRSS2Gen
   Jinja2
 
-[make-rss-script]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/make-rss.sh.in
-md5sum = 98c8f6fd81e405b0ad10db07c3776321
-output = ${buildout:directory}/template-make-rss.sh.in
-mode = 0644
 
-[monitor-template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/monitor.cfg.in
-output = ${buildout:directory}/monitor.cfg
-filename = monitor.cfg
-md5sum = 9b31959560d3cde094199e267bbb013b
-mode = 0644
+# Monitor templates files
+[monitor-httpd-conf]
+<= monitor-template-base
+md5sum = 08137be9b80e0e13d9a906c264a2f51f
+filename = monitor-httpd.conf.in
 
-[monitor-bin]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-md5sum = 5b12e864f1762d7984f7d4863d0b795d
-destination = ${buildout:parts-directory}/monitor-template-monitor-bin
-filename = monitor.py.in
-mode = 0644
+[monitor-service-conf-template]
+<= monitor-template-base
+filename = monitor-service.cfg.in
+md5sum = 5913d2a0096b50537f394a49b762b3e5
 
-[monitor-httpd-template]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-md5sum = 93e1dda50cb71bfe29966b2946c02dd1
-filename = cgi-httpd.conf.in
-mode = 0644
+[template-wrapper]
+<= monitor-template-base
+filename = wrapper.in
+md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 
-[index]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-md5sum = e759977b21c70213daa4c2701f2c2078
-destination = ${buildout:parts-directory}/monitor-index
-filename = index.cgi.in
-mode = 0644
+[monitor-conf]
+<= monitor-template-base
+filename = monitor.conf.in
+md5sum = c8f024d741c6494d7c9ba01601d0b917
+
+[monitor-instance-info]
+<= monitor-template-base
+filename = instance-info.conf.in
+md5sum = 1bdb4e05c6be04f4e5766c64467fbcec
+
+[monitor-httpd-cors]
+<= monitor-template-base
+filename = httpd-cors.cfg.in
+md5sum = 5afad2bb6e088e080e907f1d837effbb
+# End templates files
+
+
+[monitor2-template]
+recipe = slapos.recipe.template:jinja2
+filename = template-monitor.cfg
+template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
+rendered = ${buildout:directory}/template-monitor.cfg
+md5sum = e439e22e754a50e1a3500cd4a995f6d8
+context =
+    key apache_location apache:location
+    key gzip_location gzip:location
+    raw monitor_bin ${monitor2-bin:location}/${monitor2-bin:filename}
+    raw monitor_collect ${monitor-collect:location}/${monitor-collect:filename}
+    raw monitor_conf_template ${monitor-conf:location}/${monitor-conf:filename}
+    raw monitor_document_edit ${monitor-document-edit:location}/${monitor-document-edit:filename}
+    raw monitor_https_cors ${monitor-httpd-cors:location}/${monitor-httpd-cors:filename}
+    raw monitor_instance_info ${monitor-instance-info:location}/${monitor-instance-info:filename}
+    raw monitor_globalstate ${monitor-globalstate:location}/${monitor-globalstate:filename}
+    raw monitor_password_promise_template ${monitor-password-promise:location}/${monitor-password-promise:filename}
+    raw curl_executable_location ${curl:location}/bin/curl
+    raw dash_executable_location ${dash:location}/bin/dash
+    raw dcron_executable_location ${dcron:location}/sbin/crond
+    raw logrotate_executable_location ${logrotate:location}/usr/sbin/logrotate
+    raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
+    raw monitor_service_conf_template ${monitor-service-conf-template:location}/${monitor-service-conf-template:filename}
+    raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw python_executable ${buildout:executable}
+    raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
+    raw promise_executor_py ${run-promise-py:rendered}
+    raw template_wrapper ${template-wrapper:output}
+    raw status2rss_executable_path ${status2rss-executable:location}/${status2rss-executable:filename}
+
+[monitor2-bin]
+<= monitor-template-script
+filename = monitor.py
+md5sum = 222365a469f8ab08a0367d81c0b03982
+
+[run-promise-py]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/scripts/run-promise.py
+rendered = ${buildout:parts-directory}/monitor-scripts/run-promise.py
+md5sum = 8ba8b661c55f2c5a379e9e42573be486
+mode = 0755
+context =
+  raw python ${buildout:directory}/bin/${extra-eggs:interpreter}
+
+[monitor-password-promise]
+<= monitor-template-script
+filename = monitor-password-promise.py
+md5sum = f7e937d6619eb674f39f34718928d91d
+
+[status2rss-executable]
+<= monitor-template-script
+filename = status2rss.py
+md5sum = f297779d0881f4bd48081506efb492a4
 
-[index-template]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-destination = ${buildout:parts-directory}/monitor-template-index
-md5sum = 7400c8cfa16a15a0d41f512b8bbb1581
-filename = index.html.jinja2
-mode = 0644
+[monitor-globalstate]
+<= monitor-template-script
+filename = globalstate.py
+md5sum = 384a1148cb3da9cf353a108fe70709c5
 
-[status-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-md5sum = e43d79bec8824265e22df7960744113a
-destination = ${buildout:parts-directory}/monitor-template-status-cgi
-filename = status.cgi.in
-mode = 0644
+[monitor-collect]
+<= monitor-template-script
+filename = collect.py
+md5sum = cc65aebd4c35b3172a7ca83abde761bc
 
-[status-history-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-#md5sum = 4fb26753ee669b8ac90ffe33dbd12e8f
-destination = ${buildout:parts-directory}/monitor-template-status-history-cgi
-filename = status-history.cgi.in
-mode = 0644
+[monitor-document-edit]
+<= monitor-template-script
+filename = monitor-document.py
+md5sum = f3e557e5d81291a22d6d2837a9e37bd0
 
-[settings-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-md5sum = b4cef123a3273e848e8fe496e22b20a8
-destination = ${buildout:parts-directory}/monitor-template-settings-cgi
-filename = settings.cgi.in
-mode = 0644
 
-[monitor-password-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-md5sum = c7ba7ecb09d0d1d24e7cb73a212cc33f
-destination = ${buildout:parts-directory}/monitor-template-monitor-password-cgi
-filename = monitor-password.cgi.in
+[make-rss-script]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/make-rss.sh.in
+md5sum = 98c8f6fd81e405b0ad10db07c3776321
+output = ${buildout:directory}/template-make-rss.sh.in
 mode = 0644
 
-[rss-bin]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-md5sum = 6c84a826778cb059754623f39b33651b
-destination = ${buildout:parts-directory}/monitor-template-rss-bin
-filename = status2rss.py
-mode = 0644
 
-[dcron-service]
-recipe = slapos.recipe.template
-url = ${template-dcron-service:output}
-output = $${directory:services}/crond
-mode = 0700
-logfile = $${directory:log}/crond.log
 
-[download-monitor-static]
-recipe = hexagonit.recipe.download
-url = http://git.erp5.org/gitweb/slapos.git/snapshot/930be99041ea26b7b1186830e5eb56ef0acc1bdf.tar.gz
-download-only = false
-filename = monitor-static.tar.gz
-destination = ${buildout:parts-directory}/monitor-static-files
-ignore-existing = true
-strip-top-level-dir = true
-mode = 0644
+[monitor-web-monitor-logout-cgi]
+recipe = slapos.recipe.template:jinja2
+filename = monitor-logout.py.cgi
+md5sum = 5b3c0aa559722a3bae5a692ea9a0a441
+mode = 0755
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/monitor-logout.cgi
+context = key python_executable buildout:executable
 
-[download-monitor-jquery]
-recipe = hexagonit.recipe.download
-url = http://code.jquery.com/jquery-1.10.2.min.js
-download-only = true
-destination = ${download-monitor-static:destination}
-filename = jquery-1.10.2.min.js
-mode = 0644
+[monitor-web-monitor-promise-runner-cgi]
+<= monitor-download-base
+filename = monitor-run-promise.py.cgi
+md5sum = 15625e5bf6c1b57b9199250951ffc16e
 
-[template-wrapper]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/wrapper.in
-output = ${buildout:directory}/template-wrapper.cfg
-mode = 0644
-md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+[monitor-password-py-cgi]
+<= monitor-download-base
+md5sum = 04fc7e6d892d29a601cfd43d1700eeda
+filename = monitor-password.py.cgi

stack/monitor/cgi-httpd.conf.in

-PidFile "{{ httpd_configuration.get('pid-file') }}"
-
-StartServers 1
-ServerLimit 1
-ThreadLimit 4
-ThreadsPerChild 4
-
-ServerName example.com
-ServerAdmin someone@email
-<IfDefine !MonitorPort>
-Listen [{{ httpd_configuration.get('listening-ip') }}]:{{ monitor_parameters.get('port') }}
-Define MonitorPort
-</IfDefine>
-DocumentRoot "{{ directory.get('www') }}"
-ErrorLog "{{ httpd_configuration.get('error-log') }}"
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule cgid_module modules/mod_cgid.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule proxy_module      modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-# SSL Configuration
-<IfDefine !SSLConfigured>
-Define SSLConfigured
-SSLCertificateFile {{ httpd_configuration.get('certificate') }}
-SSLCertificateKeyFile {{ httpd_configuration.get('key') }}
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-SSLRandomSeed startup /dev/urandom 256
-SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
-</IfDefine>
-SSLEngine   On
-ScriptSock {{ httpd_configuration.get('cgid-pid-file') }}
-<Directory {{ directory.get('www') }}>
-  SSLVerifyDepth    1
-  SSLRequireSSL
-  SSLOptions        +StrictRequire
-  # XXX: security????
-  Options +ExecCGI
-  AddHandler cgi-script .cgi
-  DirectoryIndex {{ monitor_parameters.get('index-filename') }}
-</Directory>
-Alias /private/ {{ directory.get('private-directory') }}/
-<Directory {{ directory.get('private-directory') }}>
-Order Deny,Allow
-Deny from env=AUTHREQUIRED
-<Files ".??*">
-  Order Allow,Deny
-  Deny from all
-</Files>
-AuthType Basic
-AuthName "Private access"
-AuthUserFile "{{ monitor_parameters.get('htaccess-file') }}"
-Require valid-user
-Options Indexes FollowSymLinks
-Satisfy all
-</Directory>
-
-<Location /rewrite>
-AuthType Basic
-AuthName "Private access"
-AuthUserFile "{{ monitor_parameters.get('htaccess-file') }}"
-Require valid-user
-</Location>
-
-ProxyVia On
-RewriteEngine On
-{% for key, value in monitor_rewrite_rule.iteritems() %}
-RewriteRule ^/rewrite/{{ key }}($|/.*) {{ value }}/$1 [P,L]
-{% endfor %}

stack/monitor2/monitor-service-run.in → stack/monitor/monitor-service-run.in

@@ -34,4 +34,8 @@ def main():
     pidfile.write(str(process.pid))
 
 if __name__ == "__main__":
+  if len(sys.argv) == 1:
+    print "Use: %s Monitor_Config_File"
+    sys.exit(1)
+
   sys.exit(main())
\ No newline at end of file

stack/monitor/monitor.cfg.in

-[slap-parameters]
-recipe = slapos.cookbook:slapconfiguration
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
-
-[monitor-parameters]
-json-filename = monitor.json
-json-path = $${monitor-directory:monitor-result}/$${:json-filename}
-rss-filename = rssfeed.html
-rss-path = $${monitor-directory:public-cgi}/$${:rss-filename}
-executable = $${monitor-directory:bin}/monitor.py
-port = 9685
-htaccess-file = $${monitor-directory:etc}/.htaccess-monitor
-url = https://[$${slap-parameters:ipv6-random}]:$${:port}
-index-filename = index.cgi
-index-path = $${monitor-directory:www}/$${:index-filename}
-db-path = $${monitor-directory:etc}/monitor.db
-monitor-password-path = $${monitor-directory:etc}/.monitor.shadow
-
-[monitor-directory]
-recipe = slapos.cookbook:mkdirectory
-# Standard directory needed by monitoring stack
-home = $${buildout:directory}
-etc = $${:home}/etc
-bin = $${:home}/bin
-srv = $${:home}/srv
-var = $${:home}/var
-log = $${:var}/log
-run = $${:var}/run
-service = $${:etc}/service/
-etc-run = $${:etc}/run/
-tmp = $${:home}/tmp
-promise = $${:etc}/promise
-
-cron-entries = $${:etc}/cron.d
-crontabs = $${:etc}/crontabs
-cronstamps = $${:etc}/cronstamps
-
-ca-dir = $${:srv}/ssl
-www = $${:var}/www
-
-cgi-bin = $${:var}/cgi-bin
-monitoring-cgi = $${:cgi-bin}/monitoring
-knowledge0-cgi = $${:cgi-bin}/zero-knowledge
-public-cgi = $${:cgi-bin}/monitor-public
-
-monitor-custom-scripts = $${:etc}/monitor
-monitor-result = $${:var}/monitor
-
-private-directory = $${:srv}/monitor-private
-
-[public-symlink]
-recipe = cns.recipe.symlink
-symlink = $${monitor-directory:public-cgi} = $${monitor-directory:www}/monitor-public
-autocreate = true
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${monitor-directory:cron-entries}
-crontabs = $${monitor-directory:crontabs}
-cronstamps = $${monitor-directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${monitor-directory:service}/crond
-
-# Add log to cron
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${monitor-directory:bin}/cron_simplelogger
-log = $${monitor-directory:log}/cron.log
-
-[cron-entry-monitor]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = launch-monitor
-frequency = */5 * * * *
-command = $${deploy-monitor-script:rendered} -a
-
-[cron-entry-rss]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = build-rss
-frequency = */5 * * * *
-command = $${make-rss:rendered}
-
-[setup-static-files]
-recipe = plone.recipe.command
-command = ln -s ${download-monitor-jquery:destination} $${monitor-directory:www}/static
-update-command = $${:command}
-
-[deploy-index]
-recipe = slapos.recipe.template:jinja2
-template = ${index:location}/${index:filename}
-rendered = $${monitor-parameters:index-path}
-update-apache-access = ${apache:location}/bin/htpasswd -cb $${monitor-parameters:htaccess-file} admin
-mode = 0744
-context =
-  key cgi_directory monitor-directory:cgi-bin
-  raw index_template $${deploy-index-template:location}/$${deploy-index-template:filename}
-  key monitor_password_path monitor-parameters:monitor-password-path
-  key monitor_password_script_path deploy-monitor-password-cgi:rendered
-  key apache_update_command :update-apache-access
-  raw extra_eggs_interpreter ${buildout:directory}/bin/${extra-eggs:interpreter}
-  raw default_page /static/welcome.html
-  section rewrite_element monitor-rewrite-rule
-
-[deploy-index-template]
-recipe = hexagonit.recipe.download
-url = ${index-template:location}/$${:filename}
-destination = $${monitor-directory:www}
-filename = ${index-template:filename}
-download-only = true
-mode = 0644
-
-[deploy-status-cgi]
-recipe = slapos.recipe.template:jinja2
-template = ${status-cgi:location}/${status-cgi:filename}
-rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
-filename = status.cgi
-mode = 0744
-context =
-  key json_file monitor-parameters:json-path
-  key monitor_bin monitor-parameters:executable
-  key pwd monitor-directory:monitoring-cgi
-  key this_file :filename
-  raw python_executable ${buildout:executable}
-
-[deploy-status-history-cgi]
-recipe = slapos.recipe.template:jinja2
-template = ${status-history-cgi:location}/${status-history-cgi:filename}
-rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
-filename = status-history.cgi
-mode = 0744
-context =
-  key monitor_db_path monitor-parameters:db-path
-  key status_history_length zero-parameters:status-history-length
-  raw python_executable ${buildout:executable}
-
-[deploy-settings-cgi]
-recipe = slapos.recipe.template:jinja2
-template = ${settings-cgi:location}/${settings-cgi:filename}
-rendered = $${monitor-directory:knowledge0-cgi}/$${:filename}
-filename = settings.cgi
-mode = 0744
-context =
-  raw config_cfg $${buildout:directory}/knowledge0.cfg
-  raw timestamp $${buildout:directory}/.timestamp
-  raw python_executable ${buildout:executable}
-  key pwd monitor-directory:knowledge0-cgi
-  key this_file :filename
-
-[deploy-monitor-password-cgi]
-recipe = slapos.recipe.template:jinja2
-template = ${monitor-password-cgi:location}/${monitor-password-cgi:filename}
-rendered = $${monitor-directory:knowledge0-cgi}/$${:filename}
-filename = monitor-password.cgi
-mode = 0744
-context =
-  raw python_executable ${buildout:executable}
-  key pwd monitor-directory:knowledge0-cgi
-  key this_file :filename
-
-[deploy-monitor-script]
-recipe = slapos.recipe.template:jinja2
-template = ${monitor-bin:location}/${monitor-bin:filename}
-rendered = $${monitor-parameters:executable}
-mode = 0744
-context =
-  section directory monitor-directory
-  section monitor_parameter monitor-parameters
-  key monitoring_file_json monitor-parameters:json-path
-  raw python_executable ${buildout:executable}
-
-[make-rss]
-recipe = slapos.recipe.template:jinja2
-template = ${make-rss-script:output}
-rendered = $${monitor-directory:bin}/make-rss.sh
-mode = 0744
-context =
-  section directory monitor-directory
-  section monitor_parameters monitor-parameters
-
-[monitor-directory-access]
-recipe = plone.recipe.command
-command = ln -s $${:source} $${monitor-directory:private-directory}
-source =
-
-[monitor-instance-log-access]
-recipe = plone.recipe.command
-command = if [ -d $${:source} ]; then ln -s $${:source} $${monitor-directory:private-directory}/instance-logs; fi
-update-command = if [ -d $${:source} ]; then ln -s $${:source} $${monitor-directory:private-directory}/instance-logs; fi
-source = $${monitor-directory:home}/.slapgrid/log/
-location = $${:source}
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${monitor-directory:ca-dir}/requests/
-private = $${monitor-directory:ca-dir}/private/
-certs = $${monitor-directory:ca-dir}/certs/
-newcerts = $${monitor-directory:ca-dir}/newcerts/
-crl = $${monitor-directory:ca-dir}/crl/
-
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${monitor-directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${monitor-directory:service}/certificate_authority
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[ca-httpd]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${cadirectory:certs}/httpd.key
-cert-file = $${cadirectory:certs}/httpd.crt
-executable = $${monitor-directory:bin}/cgi-httpd
-wrapper = $${monitor-directory:service}/cgi-httpd
-# Put domain name
-name = example.com
-
-###########
-# Deploy a webserver running cgi scripts for monitoring
-###########
-[public]
-recipe = slapos.cookbook:zero-knowledge.write
-filename = knowledge0.cfg
-status-history-length = 5
-
-[zero-parameters]
-recipe = slapos.cookbook:zero-knowledge.read
-filename = $${public:filename}
-
-[monitor-rewrite-rule]
-
-# XXX could it be something lighter?
-[monitor-httpd-configuration]
-pid-file = $${monitor-directory:run}/cgi-httpd.pid
-cgid-pid-file = $${monitor-directory:run}/cgi-httpd-cgid.pid
-error-log = $${monitor-directory:log}/cgi-httpd-error-log
-listening-ip = $${slap-parameters:ipv6-random}
-certificate = $${ca-httpd:cert-file}
-key = $${ca-httpd:key-file}
-
-[monitor-httpd-configuration-file]
-recipe = slapos.recipe.template:jinja2
-template = ${monitor-httpd-template:destination}/${monitor-httpd-template:filename}
-rendered = $${monitor-directory:etc}/cgi-httpd.conf
-mode = 0744
-context =
-  section directory monitor-directory
-  section monitor_parameters monitor-parameters
-  section httpd_configuration monitor-httpd-configuration
-  section monitor_rewrite_rule monitor-rewrite-rule
-
-[cgi-httpd-wrapper]
-recipe = slapos.cookbook:wrapper
-apache-executable = ${apache:location}/bin/httpd
-command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:rendered} -DFOREGROUND
-wrapper-path = $${ca-httpd:executable}
-wait-for-files =
-  $${cadirectory:certs}/httpd.key
-  $${cadirectory:certs}/httpd.crt
-
-[cgi-httpd-graceful-wrapper]
-recipe = slapos.recipe.template:jinja2
-template = ${template-wrapper:output}
-rendered = $${monitor-directory:etc-run}/cgi-httpd-graceful
-mode = 0700
-context =
-    key content :command
-command = kill -USR1 $(cat $${monitor-httpd-configuration:pid-file})
-
-
-[monitor-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${monitor-directory:promise}/monitor
-url = $${monitor-parameters:url}/$${monitor-parameters:index-filename}
-check-secure = 1
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-monitor_url = $${monitor-parameters:url}
-
-[publish-connection-information]
-<= publish-connection-informations

stack/monitor/monitor.py.in

-#!{{ python_executable }}
-
-import json
-import os
-import subprocess
-import sys
-import sqlite3
-import time
-import threading
-from optparse import OptionParser, make_option
-
-
-FAILURE = "FAILURE"
-SUCCESS = "SUCCESS"
-
-db_path = "{{ monitor_parameter['db-path'] }}"
-instance_path = "{{ directory['home'] }}"
-monitor_dir = "{{ directory['monitor-custom-scripts'] }}"
-pid_dir = "{{ directory['run'] }}"
-promise_dir = "{{ directory['promise'] }}"
-
-monitoring_file_json = "{{ monitoring_file_json }}"
-
-option_list = [
-  make_option("-a", "--all", action="store_true", dest="all",
-              help="test everything : promises, services, customs"),
-  make_option("-n", "--no-write", action="store_true", dest="only_stdout",
-              help="just show the json output on stdout"),
-  make_option("-m", "--monitors", action="store_true", dest="monitor",
-              help="add the custom monitoring file to the files to monitor"),
-  make_option("-p", "--promises", action="store_true", dest="promise",
-              help="add the promises\'file to the files to monitor"),
-  make_option("-s", "--services", action="store_true", dest="service",
-              help="add the file containing services\'pid to the files to monitor")
-]
-
-class Popen(subprocess.Popen):
-
-  def set_timeout(self, timeout):
-    self.set_timeout = None # assert we're not called twice
-    event = threading.Event()
-    event.__killed = False # we just need a mutable
-    def t():
-      # do not call wait() or poll() because they're not thread-safe
-      if not event.wait(timeout) and self.returncode is None:
-        # race condition if waitpid completes just before the signal sent ?
-        self.terminate()
-        event.__killed = True
-        if event.wait(5):
-          return
-        if self.returncode is None:
-          self.kill() # same race as for terminate ?
-    t = threading.Thread(target=t)
-    t.daemon = True
-    t.start()
-    def killed():
-      event.set()
-      t.join()
-      return event.__killed
-    return killed
-
-def init_db(db):
-  db.executescript("""
-CREATE TABLE IF NOT EXISTS status (
-  timestamp INTEGER UNIQUE,
-  status VARCHAR(255));
-CREATE TABLE IF NOT EXISTS individual_status (
-  timestamp INTEGER,
-  status VARCHAR(255),
-  element VARCHAR(255),
-  output TEXT);
-""")
-
-def getListOfScripts(directory):
-  """
-  Get the list of script inside of a directory (not recursive)
-  """
-  scripts = []
-  if os.path.exists(directory) and os.path.isdir(directory):
-    for file_name in os.listdir(directory):
-      file = os.path.join(directory, file_name)
-      if os.access(file, os.X_OK) and not os.path.isdir(file):
-        scripts.append(file)
-  else:
-    exit("There is a problem in your directories" \
-          "of monitoring. Please check them")
-  return scripts
-
-
-def runServices(directory):
-  services = getListOfScripts(directory)
-  result = {}
-  for service in services:
-    service_path = os.path.join(pid_dir, service)
-    service_name = os.path.basename(service_path)
-    try:
-      pid = int(open(service_path).read())
-    ### because apache (or others) can write sockets
-    ### We also ignore not readable pid files
-    except (IOError, ValueError):
-      continue
-    try:
-      os.kill(pid, 0)
-      result[service_name] = ''
-    except OSError:
-      result[service_name] = "This service is not running anymore"
-  return result
-
-
-def runScripts(directory):
-  # XXX script_timeout could be passed as parameters
-  script_timeout = 60 # in seconds
-  result = {}
-  with open(os.devnull, 'r+') as f:
-    for script in getListOfScripts(directory):
-      command = os.path.join(promise_dir, script),
-      script = os.path.basename(script)
-      result[script] = ''
-
-      p = Popen(command, cwd=instance_path,
-                env=None if sys.platform == 'cygwin' else {},
-                stdin=f, stdout=f, stderr=subprocess.PIPE)
-      killed = p.set_timeout(script_timeout)
-      stderr = p.communicate()[1]
-      if killed():
-        result[script] = "Time Out"
-      elif p.returncode:
-        result[script] = stderr.strip()
-  return result
-
-
-def writeFiles(monitors):
-  timestamp = int(time.time())
-  db = sqlite3.connect(db_path)
-  init_db(db)
-  status = SUCCESS
-  for key, value in monitors.iteritems():
-    if value:
-      element_status = status = FAILURE
-    else:
-      element_status = SUCCESS
-    db.execute("insert into individual_status(timestamp, element, output, status) values (?, ?, ?, ?)", (timestamp, key, value, element_status))
-  db.execute("insert into status(timestamp, status) values (?, ?)", (timestamp, status))
-  db.commit()
-  db.close()
-  monitors['datetime'] = time.ctime(timestamp)
-  json.dump(monitors, open(monitoring_file_json, "w+"))
-
-def main():
-  parser = OptionParser(option_list=option_list)
-  monitors = {}
-  (options, args) = parser.parse_args()
-
-  if not (options.monitor or options.promise
-         or options.service or options.all):
-    exit("Please provide at list one arg in : -a, -m, -p, -s")
-
-  if options.monitor or options.all:
-    monitors.update(runScripts(monitor_dir))
-  if options.promise or options.all:
-    monitors.update(runScripts(promise_dir))
-  if options.service or options.all:
-    monitors.update(runServices(pid_dir))
-
-  if options.only_stdout:
-    print json.dumps(monitors)
-  else:
-    writeFiles(monitors)
-
-
-if __name__ == "__main__":
-  main()

stack/monitor/scripts/globalstate.py

+#!/usr/bin/env python
+
+import sys
+import os
+import glob
+import json
+import ConfigParser
+import time
+from datetime import datetime
+
+def softConfigGet(config, *args, **kwargs):
+  try:
+    return config.get(*args, **kwargs)
+  except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+    return ""
+
+def generateStatisticsData(stat_file_path, content):
+  # csv document for statictics
+  if not os.path.exists(stat_file_path):
+    with open(stat_file_path, 'w') as fstat:
+      data_dict = {
+        "date": time.time(),
+        "data": ["Date, Success, Error, Warning"]
+      }
+      fstat.write(json.dumps(data_dict))
+
+  current_state = ''
+  if content.has_key('state'):
+    current_state = '%s, %s, %s, %s' % (
+      content['date'],
+      content['state']['success'],
+      content['state']['error'],
+      content['state']['warning'])
+
+  # append to file
+  if current_state:
+    with open (stat_file_path, mode="r+") as fstat:
+      fstat.seek(0,2)
+      position = fstat.tell() -2
+      fstat.seek(position)
+      fstat.write('%s}' % ',"{}"]'.format(current_state))
+
+def main(args_list):
+  monitor_file, instance_file = args_list
+
+  monitor_config = ConfigParser.ConfigParser()
+  monitor_config.read(monitor_file)
+
+  base_folder = monitor_config.get('monitor', 'private-folder')
+  status_folder = monitor_config.get('monitor', 'public-folder')
+  base_url = monitor_config.get('monitor', 'base-url')
+  related_monitor_list = monitor_config.get("monitor", "monitor-url-list").split()
+  statistic_folder = os.path.join(base_folder, 'data', '.jio_documents')
+  parameter_file = os.path.join(base_folder, 'config', '.jio_documents', 'config.json')
+
+  if not os.path.exists(statistic_folder):
+    try:
+      os.makedirs(statistic_folder)
+    except OSError, e:
+      if e.errno == os.errno.EEXIST and os.path.isdir(statistic_folder):
+        pass
+      else: raise
+
+  # search for all status files
+  file_list = filter(os.path.isfile,
+      glob.glob("%s/*.status.json" % status_folder)
+    )
+  error = warning = success = 0
+  latest_date = ''
+  status = 'OK'
+  promise_list = []
+  global_state_file = os.path.join(base_folder, 'monitor.global.json')
+  public_state_file = os.path.join(status_folder, 'monitor.global.json')
+  for file in file_list:
+    try:
+      with open(file, 'r') as temp_file:
+        tmp_json = json.loads(temp_file.read())
+    except ValueError:
+      # bad json file ?
+      continue
+    if tmp_json['status'] == 'ERROR':
+      error  += 1
+    elif tmp_json['status'] == 'OK':
+      success += 1
+    elif tmp_json['status'] == 'WARNING':
+      warning += 1
+    if tmp_json['start-date'] > latest_date:
+      latest_date = tmp_json['start-date']
+    tmp_json['time'] = tmp_json['start-date'].split(' ')[1]
+    del tmp_json['start-date']
+    promise_list.append(tmp_json)
+
+  if error:
+    status = 'ERROR'
+  elif warning:
+    status = 'WARNING'
+  if not latest_date:
+    latest_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+
+  global_state_dict = dict(
+      status=status,
+      state={
+        'error': error,
+        'success': success,
+        'warning': warning,
+      },
+      date=latest_date,
+      _links={"rss_url": {"href": "%s/public/feed" % base_url},
+              "public_url": {"href": "%s/share/jio_public/" % base_url},
+              "private_url": {"href": "%s/share/jio_private/" % base_url}
+            },
+      data={'state': 'monitor_state.data',
+            'process_state': 'monitor_process_resource.status',
+            'process_resource': 'monitor_resource_process.data',
+            'memory_resource': 'monitor_resource_memory.data',
+            'io_resource': 'monitor_resource_io.data',
+            'monitor_process_state': 'monitor_resource.status'}
+    )
+
+  global_state_dict['_embedded'] = {'promises': promise_list}
+
+  if os.path.exists(instance_file):
+    config = ConfigParser.ConfigParser()
+    config.read(instance_file)
+    if 'instance' in config.sections():
+      instance_dict = {}
+      global_state_dict['title'] = config.get('instance', 'name')
+      global_state_dict['hosting-title'] = config.get('instance', 'root-name')
+      if not global_state_dict['title']:
+        global_state_dict['title'] = 'Instance Monitoring'
+      
+      instance_dict['computer'] = config.get('instance', 'computer')
+      instance_dict['ipv4'] = config.get('instance', 'ipv4')
+      instance_dict['ipv6'] = config.get('instance', 'ipv6')
+      instance_dict['software-release'] = config.get('instance', 'software-release')
+      instance_dict['software-type'] = config.get('instance', 'software-type')
+      instance_dict['partition'] = config.get('instance', 'partition')
+
+      global_state_dict['_embedded'].update({'instance' : instance_dict})
+
+  if related_monitor_list:
+    global_state_dict['_links']['related_monitor'] = [{'href': "%s/share/jio_public" % url}
+                          for url in related_monitor_list]
+
+  if os.path.exists(parameter_file):
+    with open(parameter_file) as cfile:
+      global_state_dict['parameters'] = json.loads(cfile.read())
+
+  # Public information with the link to private folder
+  public_state_dict = dict(
+    status=status,
+    date=latest_date,
+    _links={'monitor': {'href': '%s/share/jio_private/' % base_url}},
+    title=global_state_dict.get('title', '')
+  )
+  public_state_dict['hosting-title'] = global_state_dict.get('hosting-title', '')
+  public_state_dict['_links']['related_monitor'] = global_state_dict['_links'].get('related_monitor', [])
+
+  with open(global_state_file, 'w') as fglobal:
+    fglobal.write(json.dumps(global_state_dict))
+
+  with open(public_state_file, 'w') as fpglobal:
+    fpglobal.write(json.dumps(public_state_dict))
+
+  generateStatisticsData(
+    os.path.join(statistic_folder, 'monitor_state.data.json'),
+    global_state_dict)
+
+  return 0
+
+if __name__ == "__main__":
+  if len(sys.argv) < 3:
+    print("Usage: %s <monitor_conf_path> <instance_conf_path>" % sys.argv[0])
+    sys.exit(2)
+  sys.exit(main(sys.argv[1:]))

stack/monitor/scripts/monitor-document.py

+#!/usr/bin/env python
+
+import sys
+import os
+import re
+import json
+import argparse
+import subprocess
+from datetime import datetime
+import time
+
+
+def parseArguments():
+  """
+  Parse arguments for monitor instance.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--config_folder',
+                      help='Path where json configuration/document will be read and write')
+  parser.add_argument('--htpasswd_bin',
+                      help='Path apache htpasswd binary. Needed to write htpasswd file.')
+  parser.add_argument('--output_cfg_file',
+                      help='Ouput parameters in cfg file.')
+
+  return parser.parse_args()
+
+def fileWrite(file_path, content):
+  if os.path.exists(file_path):
+    try:
+      with open(file_path, 'w') as wf:
+        wf.write(content)
+        return True
+    except OSError, e:
+      print "ERROR while writing changes to %s.\n %s" % (file_path, str(e))
+  return False
+
+def htpasswdWrite(htpasswd_bin,  parameter_dict, value):
+  if not os.path.exists(parameter_dict['file']):
+    return False
+  command = [htpasswd_bin, '-cb', parameter_dict['htpasswd'], parameter_dict['user'], value]
+  process = subprocess.Popen(
+    command,
+    stdin=None,
+    stdout=subprocess.PIPE,
+    stderr=subprocess.PIPE
+  )
+  result = process.communicate()[0]
+  if process.returncode != 0:
+    print result
+    return False
+  with open(parameter_dict['file'], 'w') as pfile:
+    pfile.write(value)
+  return True
+
+def httpdCorsDomainWrite(httpd_cors_file, httpd_gracefull_bin, cors_domain):
+  cors_string = ""
+  cors_domain_list = cors_domain.split()
+  old_httpd_cors_file = os.path.join(
+    os.path.dirname(httpd_cors_file),
+    'prev_%s' % os.path.basename(httpd_cors_file)
+  )
+  if os.path.exists(old_httpd_cors_file) and os.path.isfile(old_httpd_cors_file):
+    try:
+      with open(old_httpd_cors_file, 'r') as cors_file:
+        if cors_file.read() == cors_domain:
+          return True
+    except OSError, e:
+      print "Failed to open file at %s. \n%s" % (old_httpd_cors_file, str(e))
+  for domain in cors_domain_list:
+    if cors_string:
+      cors_string += '|'
+    cors_string += re.escape(domain)
+  try:
+    with open(httpd_cors_file, 'w') as file:
+      file.write('SetEnvIf Origin "^http(s)?://(.+\.)?(%s)$" origin_is=$0\n' % cors_string)
+      file.write('Header always set Access-Control-Allow-Origin %{origin_is}e env=origin_is')
+  except OSError, e:
+    print "ERROR while writing CORS changes to %s.\n %s" % (httpd_cors_file, str(e))
+    return False
+
+  # Save current cors domain list
+  try:
+    with open(old_httpd_cors_file, 'w') as cors_file:
+      cors_file.write(cors_domain)
+  except OSError, e:
+    print "Failed to open file at %s. \n%s" % (old_httpd_cors_file, str(e))
+    return False
+
+  # Restart httpd process
+  try:
+    subprocess.call(httpd_gracefull_bin)
+  except OSError, e:
+    print "Failed to execute command %s.\n %s" % (httpd_gracefull_bin, str(e))
+    return False
+
+def applyEditChage(parser):
+  parameter_tmp_file = os.path.join(parser.config_folder, 'config.tmp.json')
+  config_file = os.path.join(parser.config_folder, 'config.json')
+  parameter_config_file = os.path.join(parser.config_folder, 'config.parameters.json')
+  if not os.path.exists(parameter_tmp_file) or not os.path.isfile(parameter_tmp_file):
+    return {}
+  if not os.path.exists(config_file):
+    print "ERROR: Config file doesn't exist... Exiting"
+    return {}
+
+  new_parameter_list = []
+  parameter_list = []
+  description_dict = {}
+  result_dict = {}
+
+  try:
+    with open(parameter_tmp_file) as tmpfile:
+      new_parameter_list = json.loads(tmpfile.read())
+  except ValueError:
+    print "Error: Couldn't parse json file %s" % parameter_tmp_file
+
+  with open(parameter_config_file) as tmpfile:
+    description_dict = json.loads(tmpfile.read())
+
+  for i in range(0, len(new_parameter_list)):
+    key = new_parameter_list[i]['key']
+    if key != '':
+      description_entry = description_dict[key]
+      if description_entry['type'] == 'file':
+        result_dict[key] = fileWrite(description_entry['file'], new_parameter_list[i]['value'])
+      elif description_entry['type'] == 'htpasswd':
+        result_dict[key] = htpasswdWrite(parser.htpasswd_bin, description_entry, new_parameter_list[i]['value'])
+      elif description_entry['type'] == 'httpdcors':
+        result_dict[key] = httpdCorsDomainWrite(description_entry['cors_file'], description_entry['gracefull_bin'], new_parameter_list[i]['value'])
+
+  if (parser.output_cfg_file):
+    try:
+      with open(parser.output_cfg_file, 'w') as pfile:
+        pfile.write('[public]\n')
+        for parameter in new_parameter_list:
+          if parameter['key']:
+            pfile.write('%s = %s\n' % (parameter['key'], parameter['value']))
+    except OSError, e:
+      print "Error failed to create file %s" % parser.output_cfg_file
+      pass
+
+  return result_dict
+
+if __name__ == "__main__":
+  parser = parseArguments()
+  parameter_tmp_file = os.path.join(parser.config_folder, 'config.tmp.json')
+  config_file = os.path.join(parser.config_folder, 'config.json')
+
+  # Run 4 times with sleep
+  run_counter = 1
+  max_runn = 4
+  sleep_time = 15
+
+  while True:
+    result_dict = applyEditChage(parser)
+    if result_dict != {}:
+      status = True
+      for key in result_dict:
+        if not result_dict[key]:
+          status = False
+    
+      if status and os.path.exists(parameter_tmp_file):
+        try:
+          os.unlink(config_file)
+        except OSError, e:
+          print "ERROR cannot remove file: %s" % parameter_tmp_file
+        else:
+          os.rename(parameter_tmp_file, config_file)
+    if run_counter == max_runn:
+      break
+    else:
+      run_counter += 1
+      time.sleep(sleep_time)
+
+
+
+
+
+
+
+

stack/monitor2/monitor-password-promise.py.in → stack/monitor/scripts/monitor-password-promise.py

-#!{{ python_executable }}
+#!/usr/bin/env python
+
 password_changed_once_path = "{{ password_changed_once_path }}"
 
 import os

stack/monitor/scripts/rsstoopml.py

+#!/usr/bin/env python
+
+import json
+import os
+import time
+from datetime import datetime
+
+OPML_START = """<?xml version="1.0" encoding="UTF-8"?>
+<!-- OPML generated by SlapOS -->
+<opml version="1.1">
+	<head>
+		<title>SlapOS Monitoring Status Lists</title>
+		<dateCreated>%(creation_date)s</dateCreated>
+		<dateModified>%(mondification_date)s</dateModified>
+	</head>
+	<body>
+	  <outline text="%(outline_title)s">"""
+OPML_END = """	  </outline>
+  </body>
+</opml>"""
+
+OPML_OUTLINE_FEED = '<outline text="%(title)s" title="%(title)s" type="rss" version="RSS" htmlUrl="%(html_url)s" xmlUrl="%(xml_url)s" />'
+
+def main(config_file, output_file):
+  feed_url_list = []
+  if os.path.exists(output_file):
+    creation_date = datetime.fromtimestamp(os.path.getctime(output_file)).utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000")
+    modification_date = datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000")
+  else:
+    creation_date = modification_date = datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000")
+  with open(config_file, 'r') as fconfig:
+    feed_url_list = json.loads(fconfig.read())
+
+  opml_content = OPML_START
+
+	for feed_line in feed_url_list:
+		opml_content += OPML_OUTLINE_FEED % {'title': feed_line['title'], 'html_url': feed_line['url'], 'xml_url': feed_line['url']}
+
+	opml_content += OPML_END
+
+  with open(output_file, 'w') as wfile:
+    wfile.write(opml_content)
+
+if __name__ == "__main__":
+  if len(sys.argv) < 3:
+    print("Usage: %s <rss_conf_file> <output_path>" % sys.argv[0])
+    sys.exit(2)
+	config_file = sys.argv[1]
+	output_file = sys.argv[2]
+	main(config_file, output_file)
\ No newline at end of file

stack/monitor/scripts/run-promise.py

+#!{{ python }}
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import subprocess
+import json
+import psutil
+import time
+from shutil import copyfile
+import glob
+import argparse
+
+def parseArguments():
+  """
+  Parse arguments for monitor collector instance.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--pid_path',
+                      help='Path where the pid of this process will be writen.')
+  parser.add_argument('--output',
+                      help='The Path of file where Json result of this promise will be saved.')
+  parser.add_argument('--promise_script',
+                      help='Promise script to execute.')
+  parser.add_argument('--promise_name',
+                      help='Title to give to this promise.')
+  parser.add_argument('--monitor_url',
+                      help='Monitor Instance website URL.')
+  parser.add_argument('--history_folder',
+                      help='Path where old result file will be placed before generate a new json result file.')
+  parser.add_argument('--instance_name',
+                      default='UNKNOW Software Instance',
+                      help='Software Instance name.')
+  parser.add_argument('--hosting_name',
+                      default='UNKNOW Hosting Subscription',
+                      help='Hosting Subscription name.')
+
+  return parser.parse_args()
+
+def main():
+  parser = parseArguments()
+
+  if os.path.exists(parser.pid_path):
+    with open(parser.pid_path, "r") as pidfile:
+      try:
+        pid = int(pidfile.read(6))
+      except ValueError:
+        pid = None
+      if pid and os.path.exists("/proc/" + str(pid)):
+        print("A process is already running with pid " + str(pid))
+        return 1
+  start_date = ""
+  with open(parser.pid_path, "w") as pidfile:
+    process = executeCommand(parser.promise_script)
+    ps_process = psutil.Process(process.pid)
+    start_date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ps_process.create_time()))
+    pidfile.write(str(process.pid))
+
+  status_json = generateStatusJsonFromProcess(process, start_date=start_date)
+
+  status_json['_links'] = {"monitor": {"href": parser.monitor_url}}
+  status_json['title'] = parser.promise_name
+  status_json['instance'] = parser.instance_name
+  status_json['hosting_subscription'] = parser.hosting_name
+
+  # Save the lastest status change date (needed for rss)
+  status_json['change-time'] = ps_process.create_time()
+  if os.path.exists(parser.output):
+    with open(parser.output) as f:
+      last_result = json.loads(f.read())
+      if status_json['status'] == last_result['status'] and last_result.has_key('change-time'):
+        status_json['change-time'] = last_result['change-time']
+
+  updateStatusHistoryFolder(
+    parser.promise_name,
+    parser.output,
+    parser.history_folder
+  )
+  with open(parser.output, "w") as outputfile:
+    json.dump(status_json, outputfile)
+  os.remove(parser.pid_path)
+
+def updateStatusHistoryFolder(name, status_file, history_folder):
+  old_history_list = []
+  history_path = os.path.join(history_folder, name, '.jio_documents')
+  if not os.path.exists(status_file):
+    return
+  if not os.path.exists(history_folder):
+    return
+  if not os.path.exists(history_path):
+    try:
+      os.makedirs(history_path)
+    except OSError, e:
+      if e.errno == os.errno.EEXIST and os.path.isdir(history_path):
+        pass
+      else: raise
+  with open(status_file, 'r') as sf:
+    status_dict = json.loads(sf.read())
+    filename = '%s.status.json' % (
+      status_dict['start-date'].replace(' ', '_').replace(':', ''))
+
+  copyfile(status_file, os.path.join(history_path, filename))
+  # Don't let history foler grow too much, keep 40 files
+  file_list = filter(os.path.isfile,
+      glob.glob("%s/*.status.json" % history_path)
+    )
+  file_count = len(file_list)
+  if file_count > 40:
+    file_list.sort(key=lambda x: os.path.getmtime(x))
+    while file_count > 40:
+      to_delete = file_list.pop(0)
+      try:
+        os.unlink(to_delete)
+        file_count -= 1
+      except OSError:
+        raise
+
+def generateStatusJsonFromProcess(process, start_date=None, title=None):
+  stdout, stderr = process.communicate()
+  try:
+    status_json = json.loads(stdout)
+  except ValueError:
+    status_json = {}
+  if process.returncode != 0:
+    status_json["status"] = "ERROR"
+  elif not status_json.get("status"):
+    status_json["status"] = "OK"
+  if stderr:
+    status_json["message"] = stderr
+  if start_date:
+    status_json["start-date"] = start_date
+  if title:
+    status_json["title"] = title
+  return status_json
+
+
+def executeCommand(args):
+  return subprocess.Popen(
+    args,
+    #cwd=instance_path,
+    #env=None if sys.platform == 'cygwin' else {},
+    stdin=None,
+    stdout=subprocess.PIPE,
+    stderr=subprocess.PIPE
+  )
+
+if __name__ == "__main__":
+  sys.exit(main())

stack/monitor/scripts/status2rss.py

+import sys
+import os
+import json
+import datetime
+import base64
+import hashlib
+import PyRSS2Gen
+import argparse
+
+def parseArguments():
+  """
+  Parse arguments for monitor Rss Generator.
+  """
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--items_folder',
+                      help='Path where to get *.status.json files which contain result of promises.')
+  parser.add_argument('--output',
+                      help='The Path of file where feed file will be saved.')
+  parser.add_argument('--public_url',
+                      help='Monitor Instance public URL.')
+  parser.add_argument('--private_url',
+                      help='Monitor Instance private URL.')
+  parser.add_argument('--instance_name',
+                      default='UNKNOW Software Instance',
+                      help='Software Instance name.')
+  parser.add_argument('--hosting_name',
+                      default='',
+                      help='Hosting Subscription name.')
+
+  return parser.parse_args()
+
+def getKey(item):
+  return item.pubDate
+
+def main():
+  parser = parseArguments()
+
+  rss_item_list = []
+  for filename in os.listdir(parser.items_folder):
+    if filename.endswith(".status.json"):
+      filepath = os.path.join(parser.items_folder, filename)
+      result_dict = None
+      try:
+        result_dict = json.load(open(filepath, "r"))
+      except ValueError:
+        print "Failed to load json file: %s" % filepath
+        continue
+      description = result_dict.get('message', '')
+      event_time = datetime.datetime.fromtimestamp(result_dict['change-time'])
+      rss_item = PyRSS2Gen.RSSItem(
+        categories = [result_dict['status']],
+        source = PyRSS2Gen.Source(result_dict['title'], parser.public_url),
+        title = '[%s] %s' % (result_dict['status'], result_dict['title']),
+        comments = description,
+        description = "%s: %s\n%s" % (event_time, result_dict['status'], description),
+        link = parser.private_url,
+        pubDate = event_time,
+        guid = PyRSS2Gen.Guid(base64.b64encode("%s, %s" % (event_time, result_dict['status'])))
+      )
+      rss_item_list.append(rss_item)
+
+
+  ### Build the rss feed
+  sorted(rss_item_list, key=getKey)
+  rss_feed = PyRSS2Gen.RSS2 (
+    title = parser.instance_name,
+    link = parser.public_url,
+    description = parser.hosting_name,
+    lastBuildDate = datetime.datetime.utcnow(),
+    items = rss_item_list
+    )
+  with open(parser.output, 'w') as frss:
+    frss.write(rss_feed.to_xml())
+
+if __name__ == "__main__":
+  exit(main())

stack/monitor/status2rss.py

-import datetime
-import PyRSS2Gen
-import sys
-import sqlite3
-import time
-import base64
-
-# Based on http://thehelpfulhacker.net/2011/03/27/a-rss-feed-for-your-crontabs/
-
-# ### Defaults
-TITLE = sys.argv[1]
-LINK = sys.argv[2]
-db_path = sys.argv[3]
-DESCRIPTION = TITLE
-SUCCESS = "SUCCESS"
-FAILURE = "FAILURE"
-
-items = []
-status = ""
-
-current_timestamp = int(time.time())
-# We only build the RSS for the last ten days
-period = 3600 * 24 * 10
-db = sqlite3.connect(db_path)
-rows = db.execute("select timestamp, status from status where timestamp>? order by timestamp", (current_timestamp - period,))
-for row in rows:
-  line_timestamp, line_status = row
-  line_status = line_status.encode()
-
-  if line_status == status:
-    continue
-
-  status = line_status
-
-  event_time = datetime.datetime.fromtimestamp(line_timestamp).strftime('%Y-%m-%d %H:%M:%S')
-
-  individual_rows = db.execute("select status, element, output from individual_status where timestamp=?", (line_timestamp,))
-  description = '\n'.join(['%s: %s %s' % row for row in individual_rows])
-
-  rss_item = PyRSS2Gen.RSSItem(
-    title = status,
-    description = "%s: %s\n%s" % (event_time, status, description),
-    link = LINK,
-    pubDate = event_time,
-    guid = PyRSS2Gen.Guid(base64.b64encode("%s, %s" % (event_time, status)))
-    )
-  items.append(rss_item)
-
-### Build the rss feed
-items.reverse()
-rss_feed = PyRSS2Gen.RSS2 (
-  title = TITLE,
-  link = LINK,
-  description = DESCRIPTION,
-  lastBuildDate = datetime.datetime.utcnow(),
-  items = items
-  )
-
-print rss_feed.to_xml()

stack/monitor/templates/httpd-cors.cfg.in

+{% if domain -%}
+{% set allow_domain = '|'.join(domain.replace('.', '\.').split()) -%}
+SetEnvIf Origin "^http(s)?://(.+\.)?({{ allow_domain }})$" ORIGIN_DOMAIN=$0
+Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
+{% endif -%}
\ No newline at end of file

stack/monitor/templates/instance-info.conf.in

+[instance]
+name = {{ instance_dict['name'] }}
+root-name = {{ instance_dict['root-name'] }}
+computer = {{ instance_dict['computer-id'] }}
+ipv4 = {{ instance_dict['ipv4'] }}
+ipv6 = {{ instance_dict['ipv6'] }}
+software-release = {{ instance_dict['software-release'] }}
+software-type = {{ instance_dict['software-type'] }}
+partition = {{ instance_dict['partition-id'] }}
\ No newline at end of file

stack/monitor2/monitor-httpd.conf.in → stack/monitor/templates/monitor-httpd.conf.in

@@ -11,7 +11,7 @@ ServerAdmin someone@email
 Listen [{{ parameter_dict.get('listening-ip') }}]:{{ parameter_dict.get('port') }}
 Define MonitorPort
 </IfDefine>
-DocumentRoot "{{ directory.get('www') }}"
+DocumentRoot "{{ directory.get('webdav') }}"
 ErrorLog "{{ parameter_dict.get('error-log') }}"
 LoadModule unixd_module modules/mod_unixd.so
 LoadModule access_compat_module modules/mod_access_compat.so
@@ -30,6 +30,11 @@ LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule proxy_module      modules/mod_proxy.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule env_module modules/mod_env.so
+LoadModule setenvif_module modules/mod_setenvif.so
 
 # SSL Configuration
 <IfDefine !SSLConfigured>
@@ -47,6 +52,50 @@ SSLCipherSuite RC4-SHA:HIGH:!ADH
 
 AddType application/hal+json .haljson
 SSLEngine   On
+
+Include {{ parameter_dict.get('httpd-cors-config-file') }}
+Header set Access-Control-Allow-Credentials "true"
+Header set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST"
+Header set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization"
+
+{% if parameter_dict.has_key('monitor-url-list') -%}
+RewriteEngine on
+SSLProxyEngine on
+ProxyPreserveHost On
+SSLProxyVerify none
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerName off
+{% set index=1 -%}
+{% set monitor_url_list = parameter_dict.get('monitor-url-list').split('\n') -%}
+{% for url in monitor_url_list -%}
+{%   if url.strip() -%}
+RewriteRule /monitor{{ index }}/(.*)  {{ url }}/$1 [L,P]
+{%     set index = index + 1 -%}
+{%   endif -%}
+{% endfor -%}
+{% endif -%}
+
+DavLockDB {{ directory.get('monitor-var') }}/DavLock
+Alias /share {{ directory.get('webdav') }}
+<Directory {{ directory.get('webdav') }}>
+    DirectoryIndex disabled
+    DAV On
+    Options Indexes FollowSymLinks
+    AuthType Basic
+    AuthName "webdav"
+    AuthUserFile "{{ parameter_dict.get('htpasswd-file') }}"
+    <LimitExcept OPTIONS>
+        Require valid-user
+    </LimitExcept>
+</Directory>
+
+<LocationMatch "/share/(jio_)?public">
+    <Limit GET HEAD OPTIONS REPORT PROPFIND>
+        Allow from all
+        Satisfy any
+    </Limit>
+</LocationMatch>
+
 ScriptSock {{ parameter_dict.get('cgid-pid-file') }}
 <Directory {{ directory.get('www') }}>
   SSLVerifyDepth    1
@@ -55,6 +104,7 @@ ScriptSock {{ parameter_dict.get('cgid-pid-file') }}
   # XXX: security????
   DirectoryIndex index.html
   Options FollowSymLinks
+  AllowOverride All
   Order Deny,Allow
   AuthType Basic
   AuthName "Private access"
@@ -103,3 +153,6 @@ Alias /cgi-bin {{ directory.get('cgi-bin') }}
   Options Indexes FollowSymLinks
   Satisfy all
 </Directory>
+{% if parameter_dict.get('httpd-include-file', '') -%}
+Include {{ parameter_dict.get('httpd-include-file') }}
+{% endif -%}

stack/monitor2/monitor.conf.in → stack/monitor/templates/monitor.conf.in

 [monitor]
 {% for key, value in parameter_dict.items() -%}
 {{ key }} = {{ value.strip().replace("\n", "\n  ") }}
-{% endfor -%}
+{% endfor -%}
\ No newline at end of file

stack/monitor/webfile-directory/index.cgi.in

-#!{{ extra_eggs_interpreter }}
-
-import cgi
-import cgitb
-import Cookie
-import base64
-import hashlib
-import hmac
-import jinja2
-import os
-import subprocess
-import urllib
-
-cgitb.enable(display=0, logdir="/tmp/cgi.log")
-
-form = cgi.FieldStorage()
-cookie = Cookie.SimpleCookie()
-
-cgi_path = "{{ cgi_directory }}"
-
-monitor_password_path = "{{ monitor_password_path }}"
-monitor_password_script_path = "{{ monitor_password_script_path }}"
-
-monitor_apache_password_command = "{{ apache_update_command }}"
-
-monitor_rewrite = "{{ ' '.join(rewrite_element.keys())  }}"
-
-########
-# Password functions
-#######
-def crypt(word, salt="$$"):
-  salt = salt.split("$")
-  algo = salt[0] or 'sha1'
-  if algo in hashlib.algorithms:
-    H = getattr(hashlib, algo)
-  elif algo == "plain":
-    return "%s$%s" % (algo, word)
-  else:
-    raise ValueError
-  rounds = min(max(0, int(salt[1])), 30) if salt[1] else 9
-  salt = salt[2] or base64.b64encode(os.urandom(12), "./")
-  h = hmac.new(salt, word, H).digest()
-  for x in xrange(1, 1 << rounds):
-    h = H(h).digest()
-  return "%s$%s$%s$%s" % (algo, rounds, salt,
-    base64.b64encode(h, "./").rstrip("="))
-
-def is_password_set():
-  if not os.path.exists(monitor_password_path):
-    return False
-  hashed_password = open(monitor_password_path, 'r').read()
-  try:
-    void, algo, salt, hsh = hashed_password.split('$')
-  except ValueError:
-    return False
-  return True
-
-def set_password(raw_password):
-  hashed_password = crypt(raw_password)
-  subprocess.check_call(monitor_apache_password_command + " %s" % raw_password,
-                        shell=True)
-  open(monitor_password_path, 'w').write(hashed_password)
-
-
-def check_password(raw_password):
-  """
-  Returns a boolean of whether the raw_password was correct. Handles
-  encryption formats behind the scenes.
-  """
-  if not os.path.exists(monitor_password_path) or not raw_password:
-    return False
-  hashed_password = open(monitor_password_path, 'r').read()
-  return hashed_password == crypt(raw_password, hashed_password)
-### End of password functions
-
-def forward_form():
-  command = os.path.join(cgi_path, form['posting-script'].value)
-  params_dict = {}
-  for f in form:
-    params_dict[f] = form[f].value
-  del params_dict['posting-script']
-  os.environ['QUERY_STRING'] = urllib.urlencode(params_dict)
-  try:
-    if os.access(command, os.X_OK):
-      print '\n', subprocess.check_output([command])
-  except subprocess.CalledProcessError:
-    print "There is a problem with sub-process"
-    pass
-
-
-def return_document(command=None):
-  if not command:
-    script = form['script'].value
-    command = os.path.join(cgi_path, script)
-  #XXX this functions should be called only for display,
-  #so a priori it doesn't need form data
-  os.environ['QUERY_STRING'] = ''
-  try:
-    if os.access(command, os.X_OK):
-      print '\n', subprocess.check_output([command])
-    elif os.access(command, os.R_OK):
-      print open(command).read()
-    else:
-      raise OSError
-  except (subprocess.CalledProcessError, OSError) as e:
-    print "<p>Error :</p><pre>%s</pre>" % e
-
-
-def make_menu():
-  # Transform deep-2 tree in json
-  folder_list = {}
-  for folder in os.listdir(cgi_path):
-    if os.path.isdir(os.path.join(cgi_path, folder)):
-      folder_list[folder] = []
-  for folder in folder_list:
-    for file in os.listdir(os.path.join(cgi_path, folder)):
-      if os.path.isfile(os.path.join(cgi_path, folder, file)):
-        folder_list[folder].append(file)
-  return folder_list
-
-
-def get_cookie_password():
-  cookie_string = os.environ.get('HTTP_COOKIE')
-  if cookie_string:
-    cookie.load(cookie_string)
-    try:
-      return cookie['password'].value
-    except KeyError:
-      pass
-  return None
-
-def set_cookie_password(password):
-  cookie['password'] = password
-  print cookie, "; Path=/; HttpOnly"
-
-
-# Beginning of response
-print "Content-Type: text/html"
-
-password = None
-
-# Check if user is logged
-if "password_2" in form and "password" in form:
-  password_2 = form['password_2'].value
-  password_1 = form['password'].value
-  password = get_cookie_password()
-  if not is_password_set() or check_password(password):
-    if password_2 == password_1:
-      password = password_1
-      set_password(password)
-      set_cookie_password(password)
-elif "password" in form:
-  password = form['password'].value
-  if is_password_set() and check_password(password):
-    set_cookie_password(password)
-else:
-  password = get_cookie_password()
-print '\n'
-
-
-if not is_password_set():
-  return_document(monitor_password_script_path)
-elif not check_password(password):
-  print "<html><head>"
-  print """
-    <link rel="stylesheet" href="static/pure-min.css">
-    <link rel="stylesheet" href="static/style.css">"""
-  print "</head><body>"
-  if password is None:
-    print "<h1>This is the monitoring interface</h1>"
-  else:
-    print "<h1>Error</h1><p>Wrong password</p>"
-  print """
-  <p>Please enter the monitor_password in the next field to access the data</p>
-  <form action="/index.cgi" method="post" class="pure-form-aligned">
-    Password : <input type="password" name="password">
-    <button type="submit" class="pure-button pure-button-primary">Access</button>
-  </form>
-  </body></html>"""
-# redirection to the required script/page
-else:
-  print
-  if "posting-script" in form:
-    forward_form()
-  elif "script" in form:
-    return_document()
-  else:
-    html_base = jinja2.Template(open('{{ index_template }}').read())
-    print
-    print html_base.render(tree=make_menu(), default_page="{{ default_page }}", monitor_rewrite=monitor_rewrite)

stack/monitor/webfile-directory/index.html.jinja2

-<html>
-<head>
- <title>Monitoring Interface</title>
- <link rel="stylesheet" href="static/pure-min.css">
- <link rel="stylesheet" href="static/style.css">
- <script src="static/jquery-1.10.2.min.js"></script>
- <script src="static/script.js"></script>
-</head>
-<body>
- <div id="div-menu">
-  <h1>Monitoring</h1>
- <div id="script-categories" class="pure-menu pure-menu-open">
-  <ul>
-   {% for category in tree %}
-   <li class="pure-menu-heading category">{{ category }}</li>
-    {% for script in tree[category] %}
-    <li><a href="{{ category }}/{{ script }}" class="script">{{ script }}</a></li>
-    {% endfor %}
-   {% endfor %}
-   <li class="pure-menu-heading category">Files</li>
-   <li><a href="./private/" class="link">  User: admin</br>  Password is yours</a></li>
-   <li class="pure-menu-heading category">Local Service</li>
-   {% set rewrite_list = monitor_rewrite.split() %}
-   {% for path in rewrite_list %}
-   <li><a href="./rewrite/{{path}}/" class="link">{{path}}</a></li>
-   {% endfor %}
-  </ul>
- </div>
- </div>
- <div id="content">
- <iframe src="{{ default_page }}">
- </iframe>
- </div>
-</body>
-</html>

stack/monitor/webfile-directory/monitor-password.cgi.in

-#!{{ python_executable }}
-
-import cgitb
-
-cgitb.enable()
-
-print "<html><head>"
-print """
-  <script type="text/javascript" src="static/jquery-1.10.2.min.js"></script>
-  <link rel="stylesheet" href="static/pure-min.css">
-  <link rel="stylesheet" href="static/style.css">"""
-print "</head><body>"
-print "<h1>This is the monitoring interface</h1>"
-print "<h2>Please set your password for later access</h2>"
-print """
-<form action="/index.cgi" method="post" class="pure-form-aligned">
-<div class="pure-control-group">
-<label for="password">Password*:</label>
-<input placeholder="Set your password" type="password" name="password" id="password"></br>
-</div><div class="pure-control-group">
-<label for="password">Verify Password*:</label>
-<input placeholder="Verify password" type="password" name="password_2" id="password_2"></br>
-</div><p id="validate-status" style="color:red"></p>
-<div class="pure-controls">
-<button id="register-button" type="submit" class="pure-button pure-button-primary" disabled>Access</button></div>
-</form>
-<script type="text/javascript" src="static/monitor-register.js"></script>
-</body></html>
-"""

stack/monitor/webfile-directory/settings.cgi.in

-#!{{ python_executable }}
-
-import cgi
-import cgitb
-import ConfigParser
-import os
-
-cgitb.enable()
-form = cgi.FieldStorage()
-
-print "<html><head>"
-print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
-print "<link rel=\"stylesheet\" href=\"static/style.css\">"
-print "</head><body>"
-
-config_file = "{{ config_cfg }}"
-
-if not os.path.exists(config_file):
-  print "Your software does <b>not</b> embed 0-knowledge. \
-  This interface is useless in this case</body></html>"
-  exit(0)
-
-parser = ConfigParser.ConfigParser()
-parser.read(config_file)
-
-if not parser.has_section('public'):
-  print "<p>Your software does not use 0-knowledge settings.</p></body></html>"
-  exit(0)
-
-for name in form:
-  if parser.has_option('public', name):
-    parser.set('public', name, form[name].value)
-with open(config_file, 'w') as file:
-  parser.write(file)
-
-if len(form) > 0:
-  try:
-    os.remove("{{ timestamp }}")
-  except OSError:
-    pass
-
-print "<h1>Values that can be defined :</h1>"
-print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
-print "<input type=\"hidden\" name=\"posting-script\" value=\"{{ pwd }}/{{ this_file }}\">"
-for option in parser.options("public"):
-  print "<div class=\"pure-control-group\">"
-  print "<label for=\"%s\">%s</label>" % (cgi.escape(option, quote=True), cgi.escape(option))
-  print "<input type=\"text\" name=\"%s\" value=\"%s\">" % (cgi.escape(option, quote=True), cgi.escape(parser.get('public', option), quote=True))
-  print "</div>"
-print "<div class=\"pure-controls\"><button type=\"submit\" class=\"pure-button \
- pure-button-primary\">Save</button></div></form>"
-
-print "<br><h1>Other values :</h1>"
-print "<form class=\"pure-form-aligned\">"
-for section in parser.sections():
-  if section != 'public':
-    for option in parser.options(section):
-      print "<div class=\"pure-control-group\">"
-      print "<label for=\"%s\">%s</label>" % (cgi.escape(option, quote=True), cgi.escape(option))
-      print "<input type=\"text\" name=\"%s\" value=\"%s\" readonly>" %(cgi.escape(option, quote=True), cgi.escape(parser.get(section, option), quote=True))
-      print "</div>"
-print "</form>"
-
-print "</body></html>"

stack/monitor/webfile-directory/static/monitor-register.js

-$(window).load(function(){
-  $(document).ready(function() {
-    $("#password_2").keyup(validate);
-  });
-  function validate() {
-    var password1 = $("#password").val();
-    var password2 = $("#password_2").val();
-      if(password1 == password2) {
-          $("#register-button").removeAttr("disabled");
-          $("#validate-status").attr("style", "display:none");
-      }
-      else {
-          $("#register-button").attr("disabled", "disabled");
-          $("#validate-status").attr("style", "").text("Passwords do not match");
-      }   
-  }
-});
\ No newline at end of file

stack/monitor/webfile-directory/static/script.js

-$(document).ready(function() {
-    function doDataUrl (data) {
-        var frame_content = document.getElementsByTagName("iframe")[0].contentWindow;
-        var b64 = btoa(data);
-        dataurl = 'data:text/html;base64,' + b64;
-        $("iframe").attr('src', dataurl);
-    }
-    
-    if ( window.self === window.top ) {
-        //not in an iframe
-        $(".script").click(function(e) {
-            e.preventDefault();
-            var message = $(this).attr('href');
-            var slash_pos = message.search('/');
-            //let's differenciate kind of script called
-            if ( slash_pos === -1 || slash_pos === 0) {
-                url = message;
-            }
-            else {
-                url = '/index.cgi';
-            }
-           
-            $("iframe").attr('src', url + '?script=' + encodeURIComponent(message));
-        });
-        $(".link").click(function(e) {
-            e.preventDefault();
-            var url = $(this).attr('href');
-            $("iframe").attr('src', url);
-        });
-    }
-    else {
-        //in an iframe
-        $("body").empty();
-    }
-});

stack/monitor/webfile-directory/static/style.css

-body {
-  padding: 15px;
-}
-
-.pure-menu .pure-menu-heading {
-  font-size: 120%;
-}
-
-#content {
-  display: inline-block;
-  min-width: 72%;
-  height: 97%;
-  margin-left: 30px;
-}
-
-#div-menu {
-  display: inline-block;
-  vertical-align: top;
-}
-
-#div-menu h1 {
-  text-align: center;
-}
-
-iframe {
-  width: 100%;
-  height: 100%;
-  margin: 0px;
-  padding: 0px;
-  border-style: none;
-}

stack/monitor/webfile-directory/static/welcome.html

-<html>
-<head>
- <title>Welcome to the Monitoring Interface</title>
- <link rel="stylesheet" href="pure-min.css">
- <link rel="stylesheet" href="style.css">
-</head>
-<body>
-<h1>Welcome to your monitoring interface</h1>
-<p>From this interface you can monitor, configure your instance</p>
-</body>
-</html>

stack/monitor/webfile-directory/status-history.cgi.in

-#!{{ python_executable }}
-
-import cgi
-import datetime
-import os
-import sqlite3
-
-db_path = '{{ monitor_db_path }}'
-
-status_history_length = '{{ status_history_length }}'
-
-db = sqlite3.connect(db_path)
-
-print """<html><head>
-  <link rel="stylesheet" href="static/pure-min.css">
-  <link rel="stylesheet" href="static/style.css">
-  </head><body>
-  <h1>Monitor Status History :</h1>"""
-
-
-def get_date_from_timestamp(timestamp):
-  return datetime.datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')
-
-def print_individual_status(timestamp):
-  print "<div><h3>Failure on %s</h3><ul>" % get_date_from_timestamp(timestamp)
-  rows = db.execute("select status, element, output from individual_status where timestamp=?", (timestamp,))
-  for row in rows:
-    status, element, output = row
-    print "<li>%s , %s :</br><pre>%s</pre></li>" % (status, cgi.escape(element), cgi.escape(output))
-  print "</ul></div>"
-
-
-
-if not os.path.exists(db_path):
-  print """No status history found</p></body></html>"""
-  exit(0)
-
-failure_row_list = db.execute("select timestamp from status where status='FAILURE' order by timestamp desc limit ?", status_history_length )
-
-for failure_row in failure_row_list:
-  timestamp, = failure_row
-  print_individual_status(timestamp)
-
-print "</body></html>"

stack/monitor/webfile-directory/status.cgi.in

-#!{{ python_executable }}
-
-import cgi
-import cgitb
-import json
-import os
-import subprocess
-
-def refresh():
-  command = ["{{ monitor_bin }}", "-a"]
-  subprocess.call(command)
-
-cgitb.enable(display=0, logdir="/tmp/cgi.log")
-form = cgi.FieldStorage()
-
-json_file = "{{ json_file }}"
-
-if not os.path.exists(json_file) or "refresh" in form:
-  refresh()
-
-if not os.path.exists(json_file):
-  print """<html><head>
-  <link rel="stylesheet" href="static/pure-min.css">
-  <link rel="stylesheet" href="static/style.css">
-  </head><body>
-  <h1>Monitoring :</h1>
-  No status file found</p></body></html>"""
-  exit(0)
-
-result = json.load(open(json_file))
-
-print "<html><head>"
-print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
-print "<link rel=\"stylesheet\" href=\"static/style.css\">"
-print "</head><body>"
-print "<h1>Monitoring :</h1>"
-print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
-print "<input type=\"hidden\" name=\"posting-script\" value=\"{{ pwd }}/{{ this_file }}\">"
-print "<p><em>Last time of monitoring process : %s</em></p>" % (result['datetime'])
-del result['datetime']
-print "<div class=\"pure-controls\"><button type=\"submit\" class=\"pure-button \
- pure-button-primary\" name=\"refresh\" value=\"refresh\">Refresh</button></div></form>"
-print "<br/>"
-
-print "<h2>These scripts and promises have failed :</h2>"
-for r in result:
-  if result[r] != '':
-    print "<h3>%s</h3><pre style=\"padding-left:30px;\">%s</pre>" % (cgi.escape(r), cgi.escape(result[r]))
-print "<br/>"
-
-print "<h2>These scripts and promises were successful :</h2>"
-print "<ul>"
-for r in result:
-  if result[r] == '':
-    print "<li>%s</li>" % (r)
-print "</ul>"
-print "</body></html>"

stack/monitor2/cgi-httpd.conf.in

-PidFile "{{ httpd_configuration.get('pid-file') }}"
-
-StartServers 1
-ServerLimit 1
-ThreadLimit 4
-ThreadsPerChild 4
-
-ServerName example.com
-ServerAdmin someone@email
-<IfDefine !MonitorPort>
-Listen [{{ httpd_configuration.get('listening-ip') }}]:{{ monitor_parameters.get('port') }}
-Define MonitorPort
-</IfDefine>
-DocumentRoot "{{ directory.get('www') }}"
-ErrorLog "{{ httpd_configuration.get('error-log') }}"
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule cgid_module modules/mod_cgid.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule proxy_module      modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-# SSL Configuration
-<IfDefine !SSLConfigured>
-Define SSLConfigured
-SSLCertificateFile {{ httpd_configuration.get('certificate') }}
-SSLCertificateKeyFile {{ httpd_configuration.get('key') }}
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-SSLRandomSeed startup /dev/urandom 256
-SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
-</IfDefine>
-SSLEngine   On
-ScriptSock {{ httpd_configuration.get('cgid-pid-file') }}
-<Directory {{ directory.get('www') }}>
-  SSLVerifyDepth    1
-  SSLRequireSSL
-  SSLOptions        +StrictRequire
-  # XXX: security????
-  Options +ExecCGI
-  AddHandler cgi-script .cgi
-  DirectoryIndex {{ monitor_parameters.get('index-filename') }}
-</Directory>
-Alias /private/ {{ directory.get('private-directory') }}/
-<Directory {{ directory.get('private-directory') }}>
-Order Deny,Allow
-Deny from env=AUTHREQUIRED
-<Files ".??*">
-  Order Allow,Deny
-  Deny from all
-</Files>
-AuthType Basic
-AuthName "Private access"
-AuthUserFile "{{ monitor_parameters.get('htaccess-file') }}"
-Require valid-user
-Options Indexes FollowSymLinks
-Satisfy all
-</Directory>
-
-<Location /rewrite>
-AuthType Basic
-AuthName "Private access"
-AuthUserFile "{{ monitor_parameters.get('htaccess-file') }}"
-Require valid-user
-</Location>
-
-ProxyVia On
-RewriteEngine On
-{% for key, value in monitor_rewrite_rule.iteritems() %}
-RewriteRule ^/rewrite/{{ key }}($|/.*) {{ value }}/$1 [P,L]
-{% endfor %}

stack/monitor2/index.html

-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" href="monitor.css" />
-    <script src="monitor.js"></script>
-  </head>
-  <body>
-    <noscript>Please enable javascript on your browser to make this application to work.</noscript>
-  </body>
-</html>

stack/monitor2/make-rss.sh.in

-#!${dash-output:dash}
-
-STATUS_DB={{ monitor_parameters['db-path'] }}
-RSS_FILE={{ monitor_parameters['rss-path'] }}
-PYTHON=${buildout:directory}/bin/${extra-eggs:interpreter}
-STATUS2RSS=${rss-bin:location}/${rss-bin:filename}
-
-$PYTHON $STATUS2RSS "Monitoring RSS feed" "{{ monitor_parameters['url'] }}/{{ monitor_parameters['index-filename'] }}" $STATUS_DB > $RSS_FILE

stack/monitor2/monitor-logout.html

-<!DOCTYPE html>
-<html>
-  <head><title>Monitor logout</title></head>
-  <body>
-    <noscript>Cannot logout without javascript</noscript>
-    <script>
-      var logoutURL = "/cgi-bin/monitor-logout.cgi",
-        xhr = new XMLHttpRequest();
-      xhr.onload = function () {
-        if (xhr.status === 401) {
-          document.body.innerHTML = "<p>You are now logged out. You can go back to the monitor interface <a href=\"/\">here</a>.</p>";
-        } else {
-          console.error("Cannot logout (" + xhr.status + ")");
-          document.body.innerHTML = "<p>Cannot logout, retrying in 5 seconds.</p>";
-          setTimeout(location.reload.bind(location), 5000);
-        }
-      };
-      xhr.onerror = function () {
-        document.body.innerHTML = "<p>Cannot logout, please try again later.</p>";
-      };
-      xhr.open("POST", logoutURL, true, " logout", " password");
-      xhr.send();
-      document.body.innerHTML = "<p>Logging out...</p>";
-    </script>
-  </body>
-</html>

stack/monitor2/monitor.css

-body { width: 80vw; margin: auto; padding-top: 1%; }
-/* h1 { align-text: center; margin: auto; } */
-/*td { padding: 0 2%; }/**/
-td { padding: 0 1em; }/**/
-table { border: 1px solid black; }
-table > table { margin-top: 1em; }
-
-input {
-  box-sizing: border-box;
-  min-height: 10mm;
-  min-width: 10mm;
-}
-
-button {
-  box-sizing: border-box;
-  min-height: 10mm;
-  min-width: 10mm;
-  background-color: lightgray;
-  background: linear-gradient(180deg, #F6F6F6 0%, #DDDDDD 100%);
-  border-radius: 2px;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #A4A4A4;
-}
-
-a.as-button {
-  display: inline-block;
-  box-sizing: border-box;
-  min-height: 10mm;
-  min-width: 10mm;
-  padding: 0.5em 0.5em;
-  text-align: center;
-  text-decoration: initial;
-}
-a.as-button {
-  color: black;
-  background-color: lightgray;
-  background: linear-gradient(180deg, #F6F6F6 0%, #DDDDDD 100%);
-  border-radius: 2px;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #A4A4A4;
-}
-a.as-button:active, button:active {
-  background-color: white;
-  background: linear-gradient(0deg, #F6F6F6 0%, #DDDDDD 100%);
-}
-a.as-button:hover, button:hover {
-  border-color: #777777;
-}

stack/monitor2/run-promise.py

-#!{{ python_executable }}
-# -*- coding: utf-8 -*-
-
-import sys
-import os
-import subprocess
-import json
-from cStringIO import StringIO
-
-def main():
-  if len(sys.argv) < 4:
-    print("Usage: %s <pid_path> <output_path> <command...>" % sys.argv[0])
-    return 2
-  pid_path=sys.argv[1]
-  output_path=sys.argv[2]
-  if os.path.exists(pid_path):
-    with open(pid_path, "r") as pidfile:
-      try:
-        pid = int(pidfile.read(6))
-      except ValueError:
-        pid = None
-      if pid and os.path.exists("/proc/" + str(pid)):
-        print("A process is already running with pid " + str(pid))
-        return 1
-  with open(pid_path, "w") as pidfile:
-    process = executeCommand(sys.argv[3:])
-    pidfile.write(str(process.pid))
-  status_json = generateStatusJsonFromProcess(process)
-  with open(output_path, "w") as outputfile:
-    json.dump(status_json, outputfile)
-  os.remove(pid_path)
-
-
-def generateStatusJsonFromProcess(process):
-  stdout, stderr = process.communicate()
-  try:
-    status_json = json.loads(stdout)
-  except ValueError:
-    status_json = {}
-  if process.returncode != 0:
-    status_json["status"] = "error"
-  elif not status_json.get("status"):
-    status_json["status"] = "OK"
-  if stderr:
-    status_json["error"] = stderr
-  return status_json
-
-
-def executeCommand(args):
-  return subprocess.Popen(
-    args,
-    #cwd=instance_path,
-    #env=None if sys.platform == 'cygwin' else {},
-    stdin=None,
-    stdout=subprocess.PIPE,
-    stderr=subprocess.PIPE
-  )
-
-if __name__ == "__main__":
-  sys.exit(main())