No OneTemporary
Actions

Size

17 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/_tests/Makefile b/_tests/Makefile
	index 21fa162..84b6ad0 100644
	--- a/_tests/Makefile
	+++ b/_tests/Makefile
	@@ -1,3 +1,4 @@
	test:
	python -m unittest discover modules
	python -m unittest discover pillar
	+ python -m unittest discover scripts/python
	diff --git a/_tests/data/T1492-ps-x-sample.txt b/_tests/data/T1492-ps-x-sample.txt
	new file mode 100644
	index 0000000..c4dc97f
	--- /dev/null
	+++ b/_tests/data/T1492-ps-x-sample.txt
	@@ -0,0 +1,10 @@
	+ PID TTY STAT TIME COMMAND
	+ 1 ? Ss 0:00 /sbin/tini -- bundle exec sidekiq
	+ 7 ? Sl 7:33 sidekiq 5.2.2 mastodon [12 of 12 busy]
	+ 1552 pts/0 Ss 0:00 bash
	+11562 ? Sl 1:11 ffmpeg -i /tmp/8d777f385d3dfec8815d20f7496026dc201812
	+11693 ? Rl 1:11 ffmpeg -i /tmp/8d777f385d3dfec8815d20f7496026dc201812
	+11895 ? Sl 1:05 ffmpeg -i /tmp/8d777f385d3dfec8815d20f7496026dc201812
	+12033 ? Sl 0:28 ffmpeg -i /tmp/8d777f385d3dfec8815d20f7496026dc201812
	+12114 ? Sl 0:11 ffmpeg -i /tmp/8d777f385d3dfec8815d20f7496026dc201812
	+12528 pts/0 R+ 0:00 ps x
	diff --git a/_tests/scripts/python/test_clear_video_queue.py b/_tests/scripts/python/test_clear_video_queue.py
	new file mode 100644
	index 0000000..c5e663b
	--- /dev/null
	+++ b/_tests/scripts/python/test_clear_video_queue.py
	@@ -0,0 +1,16 @@
	+from importlib.machinery import SourceFileLoader
	+import unittest
	+
	+
	+path = "roles/paas-docker/containers/files/mastodon/clear-video-queue.py"
	+script = SourceFileLoader('script', "../" + path).load_module()
	+
	+
	+class Testinstance(unittest.TestCase):
	+
	+ def test_extract_pids(self):
	+ with open("data/T1492-ps-x-sample.txt", "r") as fd:
	+ ps_data = [line.strip() for line in fd]
	+
	+ expected_pids = [11562, 11693, 11895]
	+ self.assertEqual(expected_pids, script.extract_pids(ps_data))
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	index 28650b2..e8c929b 100644
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -1,451 +1,463 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-03-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	docker_aliases:
	- &ipv4_equatower 51.255.124.10

	# -------------------------------------------------------------
	# Images
	#
	# You can append a :tag (by default, latest is used).
	#
	# It's not possible to specify Docker library images only by final name.
	# See https://docs.saltstack.com/en/latest/ref/states/all/salt.states.docker_image.html
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_images:
	'*':
	- certbot/certbot

	dwellers:
	# Core services
	- nasqueron/mysql:5.7
	- nasqueron/rabbitmq

	# Infrastructure and development services
	- dereckson/cachet
	- nasqueron/notifications

	equatower:
	# Core services
	- library/postgres
	- library/redis:3.2-alpine
	- library/registry
	- nasqueron/mysql

	# Nasqueron services
	- nasqueron/auth-grove

	# Nasqueron API microservices
	- nasqueron/docker-registry-api

	# Infrastructure and development services
	- nasqueron/aphlict
	- nasqueron/etherpad:production
	- nasqueron/phabricator

	# Continuous deployment jobs
	- jenkins/jenkins
	- nasqueron/jenkins-slave-node
	- nasqueron/jenkins-slave-php
	- nasqueron/jenkins-slave-rust
	- nasqueron/tommy

	# Pixelfed
	- nasqueron/pixelfed

	# Sentry
	- library/sentry
	- tianon/exim4

	# -------------------------------------------------------------
	# Networks
	#
	# Containers can be grouped by network, instead to use links.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_networks:
	dwellers:
	bugzilla:
	subnet: 172.21.3.0/24
	equatower:
	cd:
	subnet: 172.18.1.0/24
	ci:
	subnet: 172.18.2.0/24

	# -------------------------------------------------------------
	# Docker engine configuration
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_daemon:
	equatower:
	storage-driver: devicemapper
	storage-opts:
	- "dm.thinpooldev=/dev/mapper/wharf-thinpool"
	- "dm.use_deferred_removal=true"
	- "dm.use_deferred_deletion=true"

	docker_devicemapper:
	equatower:
	thinpool: wharf-thinpool

	# -------------------------------------------------------------
	# Containers
	#
	# The docker_containers entry allow to declare
	# containers by image by servers
	#
	# The hierarchy is so as following.
	#
	# docker_containers:
	# server with the Docker engine:
	# service codename:
	# instance name:
	# container properties
	#
	# The service codename must match a state file in
	# the roles/paas-docker/containers/ directory.
	#
	# The container will be run with the specified instance name.
	#
	# nginx
	#
	# The container properties can also describe the information
	# needed to configure nginx with the host and app_port key.
	#
	# In such case, a matching vhost file should be declared as
	# roles/paas-docker/nginx/files/vhosts/<service codename>.sls
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_containers:

	#
	# Dwellers is the engine for Mastodon and CI intelligent bus services
	#
	dwellers:

	#
	# Core services
	#

	mysql:
	bugzilla_db:
	network: bugzilla
	version: 5.7

	#
	# Notifications center
	#

	notifications:
	notifications:
	host: notifications.nasqueron.org
	app_port: 37080
	broker_link: white-rabbit
	credentials:
	broker: nasqueron.notifications.broker
	mailgun: nasqueron.notifications.mailgun
	sentry:
	realm: nasqueron
	project_id: 2
	credential: nasqueron.notifications.sentry

	#
	# Bugzilla
	#

	bugzilla:
	ew_bugzilla:
	host: bugzilla.espace-win.org
	app_port: 33080
	network: bugzilla
	mysql:
	host: bugzilla_db
	db: EspaceWin_Bugs
	credential: espacewin.bugzilla.mysql

	+ #
	+ # Mastodon
	+ #
	+
	+ # Mastodon is currently deployed manually through docker-compose
	+ # and not yet integrated to the platform. This declaration is
	+ # currently only used for extra utilities deployment.
	+
	+ mastodon_sidekiq:
	+ mastodon_sidekiq_1:
	+ realm: nasqueron
	+
	#
	# Equatower is the current production engine
	#
	equatower:

	#
	# Core services
	#

	mysql:
	acquisitariat: {}
	phpbb_db: {}

	postgresql:
	sentry_db:
	credential: nasqueron.sentry.postgresql

	redis:
	sentry_redis: {}
	pixelfed_redis: {}

	registry:
	registry:
	host: registry.nasqueron.org
	app_port: 5000
	allowed_ips:
	# Localhost
	- 127.0.0.1

	# Dwellers (through temporary tunnel)
	- 10.0.2.1

	#
	# CI and CD
	#

	jenkins:
	jenkins_cd:
	realm: cd
	host: cd.nasqueron.org
	app_port: 38080
	jnlp_port: 50000
	jenkins_ci:
	realm: ci
	host: ci.nasqueron.org
	app_port: 42080
	jnlp_port: 55000

	jenkins_slave:
	# Slaves for CD
	apsile: &php_for_cd
	image: php
	realm: cd

	elapsi: *php_for_cd

	rust_brown:
	image: rust
	realm: cd

	yarabokin:
	image: node
	realm: cd

	zateki: &php_for_ci
	image: php
	realm: ci

	zenerre: *php_for_ci

	tommy:
	tommy_ci:
	app_port: 24080
	host: builds.nasqueron.org
	aliases:
	- build.nasqueron.org
	jenkins_url: https://ci.nasqueron.org

	tommy_cd:
	# No host definition, as this dashboard is mounted on infra.nasqueron.org
	app_port: 24180
	jenkins_url: https://cd.nasqueron.org

	# Infrastructure and development services

	phabricator:
	# Nasqueron instance
	devcentral:
	app_port: 31080
	host: devcentral.nasqueron.org
	aliases:
	- phabricator.nasqueron.org
	blogs:
	servers:
	host: servers.nasqueron.org
	aliases:
	- server.nasqueron.org
	- serveur.nasqueron.org
	- serveurs.nasqueron.org
	mailer: mailgun
	credentials:
	mysql: zed.phabricator.mysql
	static_host: phabricator-files-for-devcentral-nasqueron.spacetechnology.net
	title: Nasqueron DevCentral
	mysql_link: acquisitariat
	skip_container: True

	# Private instance for Dereckson
	river_sector:
	app_port: 23080
	host: river-sector.dereckson.be
	static_host: phabricator-files-for-river-sector.nasqueron.org
	mailer: _
	credentials:
	mysql: dereckson.phabricator.mysql
	storage:
	namespace: river_sector
	title: River Sector
	mysql_link: acquisitariat

	# Wolfplex instance
	wolfplex_phab:
	app_port: 35080
	host: phabricator.wolfplex.be
	aliases:
	- phabricator.wolfplex.org
	static_host: phabricator-files-for-wolfplex.nasqueron.org
	mailer: mailgun
	credentials:
	mailgun: wolfplex.phabricator.mailgun
	mysql: wolfplex.phabricator.mysql
	storage:
	namespace: wolfphab
	title: Wolfplex Phabricator
	mysql_link: acquisitariat

	# Zed instance
	zed_code:
	app_port: 36080
	host: code.zed.dereckson.be
	static_host: phabricator-files-for-zed.nasqueron.org
	mailer: sendgrid
	credentials:
	mysql: zed.phabricator.mysql
	sendgrid: zed.phabricator.sendgrid
	storage:
	namespace: zedphab
	title: Zed
	mysql_link: acquisitariat

	aphlict:
	aphlict:
	ports:
	client: 22280
	admin: 22281

	cachet:
	cachet:
	app_port: 39080
	host: status.nasqueron.org
	credential: nasqueron.cachet.mysql
	app_key: nasqueron.cachet.app_key
	mysql_link: acquisitariat

	etherpad:
	pad:
	app_port: 34080
	host: pad.nasqueron.org
	aliases:
	- pad.wolfplex.org
	- pad.wolfplex.be
	credential: nasqueron.etherpad.api
	mysql_link: acquisitariat

	auth-grove:
	login:
	app_port: 25080
	host: login.nasqueron.org
	credential: nasqueron.auth-grove.mysql
	mysql_link: acquisitariat

	# API microservices

	docker-registry-api:
	api-docker-registry:
	app_port: 20080
	api_entry_point: /docker/registry
	registry_instance: registry

	# phpBB SaaS
	# The SaaS uses a MySQL instance, declared in the MySQL section.

	# Openfire
	openfire:
	openfire:
	ip: *ipv4_equatower
	app_port: 9090
	host: xmpp.nasqueron.org

	# Pixelfed
	pixelfed:
	pixelfed:
	app_port: 30080
	host: photos.nasqueron.org
	aliases:
	- photo.nasqueron.org
	links:
	mysql: acquisitariat
	redis: pixelfed_redis
	credentials:
	app_key: nasqueron.pixelfed.app_key
	mailgun: nasqueron.pixelfed.mailgun
	mysql: nasqueron.pixelfed.mysql
	app:
	title: Nasqueron Photos
	max_album_length: 16

	# Sentry
	# The Sentry instance uses a Redis and a PostgreSQL instance,
	# declared above.
	exim:
	sentry_smtp:
	mailname: mx.sentry.nasqueron.org

	sentry:
	sentry_web_1:
	app_port: 26080
	host: sentry.nasqueron.org

	# As an instance is divided between a web, a cron and a worker
	# containers, we need an identified to share a data volume.
	realm: nasqueron

	sentry_worker:
	sentry_worker_1:
	realm: nasqueron

	sentry_cron:
	sentry_cron:
	realm: nasqueron

	# -------------------------------------------------------------
	# Ports listened by XMPP
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	xmpp_ports:
	- 3478
	- 5222 # Client to server
	- 5223 # Client to server (Encrypted (legacy-mode) connections)
	- 5262 # Connections managers
	- 5269 # Server to server
	- 5275 # External components
	- 5276 # External components (Encrypted (legacy-mode) connections)
	- 7070 # HTTP binding
	- 7443 # HTTP binding with TLS
	- 7777 # File transfer proxy
	- 9090 # Web administration server
	- 9091 # Web administration server with TLS

	# -------------------------------------------------------------
	# Zemke-Rhyne clients
	#
	# This section should list all the Docker engines server
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	zr_clients:
	- key: 2
	allowedConnectionFrom:
	- 172.27.26.49
	- dwellers.nasqueron.drake
	- dwellers.nasqueron.org
	restrictCommand:
	comment: Zemke-Rhyne

	- key: 123
	allowedConnectionFrom:
	- equatower.nasqueron.org
	restrictCommand:
	comment: Zemke-Rhyne
	diff --git a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
	new file mode 100755
	index 0000000..cbf9212
	--- /dev/null
	+++ b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
	@@ -0,0 +1,89 @@
	+#!/usr/bin/env python2
	+
	+# -------------------------------------------------------------
	+# Mastodon - clear stuck video tasks from quueue
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# Created: 2018-12-08
	+# License: Trivial work, not eligible to copyright
	+# Source file: roles/paas-docker/containers/files/mastodon/clear-video-queue.py
	+# -------------------------------------------------------------
	+#
	+# <auto-generated>
	+# This file is managed by our rOPS SaltStack repository.
	+#
	+# Changes to this file may cause incorrect behavior
	+# and will be lost if the state is redeployed.
	+# </auto-generated>
	+
	+
	+from __future__ import print_function
	+import subprocess
	+
	+
	+PS_COLUMN_PID = 0
	+PS_COLUMN_TIME = 3
	+PS_COLUMN_COMMAND = 4
	+
	+SUSPECT_COMMANDS = [
	+ "ffmpeg"
	+]
	+
	+MAX_TIME = 30
	+
	+
	+def parse_time(time):
	+ time_parts = [int(token) for token in time.split(":")]
	+ return time_parts[0] * 60 + time_parts[1]
	+
	+
	+def process_time_is_up(time):
	+ return parse_time(time) > MAX_TIME
	+
	+
	+def process_is_suspect(command):
	+ for suspect_command in SUSPECT_COMMANDS:
	+ if command.startswith(suspect_command):
	+ return True
	+
	+ return False
	+
	+
	+def extract_pid(ps_output_line):
	+ if not ps_output_line[0].isdigit():
	+ return None
	+
	+ tokens = ps_output_line.split(None, 4)
	+ extracted_pid = int(tokens[PS_COLUMN_PID])
	+ time = tokens[PS_COLUMN_TIME]
	+ command = tokens[PS_COLUMN_COMMAND]
	+
	+ if process_time_is_up(time) and process_is_suspect(command):
	+ return extracted_pid
	+
	+ return None
	+
	+
	+def extract_pids(output):
	+ extracted_pids = [extract_pid(line) for line in output]
	+
	+ return [extracted_pid
	+ for extracted_pid in extracted_pids
	+ if extracted_pid is not None]
	+
	+
	+def get_kill_command(pids_to_kill):
	+ command = ["kill", "-9 "]
	+ command.extend([str(pid_to_kill) for pid_to_kill in pids_to_kill])
	+
	+ return command
	+
	+
	+if __name__ == "__main__":
	+ ps_output = subprocess.check_output(["ps", "x"])
	+ ps_data = [line.strip() for line in ps_output.strip().split("\n")]
	+
	+ pids = extract_pids(ps_data)
	+ kill_command = get_kill_command(pids)
	+
	+ subprocess.call(kill_command)
	diff --git a/roles/paas-docker/containers/mastodon.sls b/roles/paas-docker/containers/mastodon.sls
	new file mode 100644
	index 0000000..6828a29
	--- /dev/null
	+++ b/roles/paas-docker/containers/mastodon.sls
	@@ -0,0 +1,36 @@
	+# -------------------------------------------------------------
	+# Salt — Provision Docker engine
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# Created: 2018-12-08
	+# License: Trivial work, not eligible to copyright
	+# -------------------------------------------------------------
	+
	+{% set containers = pillar['docker_containers'][grains['id']] %}
	+
	+# -------------------------------------------------------------
	+# Extra utilities
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+/srv/mastodon/extra_utilities:
	+ file.directory:
	+ - makedirs: True
	+
	+/srv/mastodon/extra_utilities/clear-video-queue:
	+ file.managed:
	+ - source: salt://roles/paas-docker/containers/files/mastodon/clear-video-queue.py
	+ - mode: 755
	+
	+# -------------------------------------------------------------
	+# Provision extra utilities
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+{% for instance in containers['mastodon_sidekiq'] %}
	+
	+provision_clear_video_queue_{{ instance }}:
	+ cmd.run:
	+ - name: docker cp /srv/mastodon/extra_utilities/clear-video-queue {{ instance }}:/usr/bin/clear-video-queue
	+ - require:
	+ - file: /srv/mastodon/extra_utilities/clear-video-queue
	+
	+{% endfor %}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 25, 18:33 (11 h, 34 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2260714
Default Alt Text: (17 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions