External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-27 00:21:30 -03:30
Code Issues Packages Projects Releases Wiki Activity
25,621 Commits 55 Branches 19 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
Christian Adams
c565130b35 TERM rsyslogd instead of KILL for more graceful shutdown 2020-05-05 15:38:57 -04:00
Christian Adams
c07b6285da Increase stopwait time for rsyslogd service 2020-04-27 14:33:46 -04:00
softwarefactory-project-zuul[bot]
c0e07198cf
Merge pull request #6283 from AlanCoding/vendoring_collections 
Use vendored collections for inventory imports

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-23 18:54:50 +00:00
Bill Nottingham
47fef1dcf3 Don't use SCLs for openshift. 
This may be a mis-merge?
 2020-04-22 17:16:44 -04:00
Ryan Petrello
7bfc99a615
don't expose redis port 2020-04-17 15:34:11 -04:00
AlanCoding
fcf75af6a7
Get current cloud sources working from collection 
update test data files

Adopt official vendor location

openstack not published yet

Add collections to show paths

Add collections loc to installer settings

Add vendored collections to show path again
 2020-04-16 20:55:59 -04:00
Christian Adams
c8ceb62269 Rename awx rsyslog socket and PID dir 2020-04-15 14:11:15 -04:00
Ryan Petrello
75bb7cce22
don't wait on memcached TCP 2020-04-14 11:45:27 -04:00
Ryan Petrello
f7f1bdf9c9
properly configure supervisorctl to point at the web volume mount 2020-04-13 21:56:52 -04:00
Ryan Petrello
69cf915a20
add rsyslogd block to the k8s supervisord config file 2020-04-13 20:25:53 -04:00
Christian Adams
ca7c840d8c Fix permissions on rsyslog.conf for k8s 2020-04-13 19:33:23 -04:00
Christian Adams
a0e31b9c01 Map logging timeout value to healthchecktimeout for http in rsyslog config 2020-04-13 15:22:16 -04:00
Ryan Petrello
e52cebc28e rsyslogd: use %rawmsg-after-pri% instead of %msg% 
after some prolonged RFC reading and tinkering w/ rsyslogd...

cpython's SysLogHandler doesn't emit RFC3164 formatted messages
in the format you'd expect; it's missing the ISO date, hostname, etc...
along with other header values; the handler implementation relies on you
to specify a syslog-like formatter (we've replaced all of this with our
own *custom* logstash-esque formatter that effectively outputs valid JSON
- without dates and other syslog header values prepended)

because of this unanticipated format, rsyslogd chokes when trying to
parse the message's parts;  AWX is emitting:

<priority>RAWJSON

...so the usage of `%msg%` isn't going to work for us, because rsyslog
tries to parse *all* of the possible headers (and yells, because it
can't find a date to parse):

see: https://www.rsyslog.com/files/temp/doc-indent/configuration/properties.html#message-properties

this is fine, because we don't *need* any of that message parsing
anyways; in the end, we're *just* interested in forwarding the raw
JSON/text content to the third party log handler
 2020-04-13 11:44:00 -04:00
Christian Adams
5d54877183 Add action to default rsyslog.conf so supervisor starts correctly the first time 2020-04-13 11:44:00 -04:00
Christian Adams
70391f96ae Revert rsyslog valid config to one that fails intentionally 2020-04-13 11:43:59 -04:00
Christian Adams
2329c1b797 Add rsyslog config to container from file for consistency 2020-04-13 11:43:59 -04:00
Christian Adams
e740340793 ConfigMap rsyslog conf files for k8 2020-04-13 11:43:59 -04:00
Christian Adams
996d7ce054 Move supervisor and rsyslog sock files to their own dirs under /var/run 2020-04-13 11:43:59 -04:00
Shane McDonald
c0af3c537b Configure rsyslog to listen over a unix domain socket instead of a port 
- Add a placeholder rsyslog.conf so it doesn't fail on start
 - Create access restricted directory for unix socket to be created in
 - Create RSyslogHandler to exit early when logging socket doesn't exist
 - Write updated logging settings when dispatcher comes up and restart rsyslog so they  take effect
 - Move rsyslogd to the web container and create rpc supervisor.sock
 - Add env var for supervisor.conf path
 2020-04-13 11:43:59 -04:00
chris meyers
c06188da56 align with openshift 2020-04-06 09:16:46 -04:00
chris meyers
7433aab258 switch memcached from tcp to unix domain socket 2020-04-06 08:35:12 -04:00
chris meyers
37a715c680 use memcached unix domain socket rather than tcp 2020-04-06 08:35:12 -04:00
chris meyers
6d0c42a91a align with configmap changes 2020-04-02 20:05:26 -04:00
Christian Adams
9489f00ca4 Align k8 and ocp supervisor scripts 
- Handle scl enable calls for python processes that use postgresql
 - Handle ocp specific vars better
 2020-04-02 13:56:33 -04:00
chris meyers
6d60e7dadc align with openshift 2020-04-02 13:56:33 -04:00
Christian Adams
346b9b9e3e ConfigMap supervisor configs and launch scripts for k8s 2020-04-02 13:56:33 -04:00
softwarefactory-project-zuul[bot]
99384b1db9
Merge pull request #6506 from shanemcd/stateless-set 
Switch from StatefulSet to Deployment

Reviewed-by: Matthew Jones <mat@matburt.net>
             https://github.com/matburt
 2020-04-02 17:51:25 +00:00
Shane McDonald
d57258878d
Update more references to statefulset 2020-04-02 12:44:26 -04:00
Shane McDonald
ff0186f72b
Delete k8s StatefulSet if it exists (for upgrades) 2020-04-02 12:21:35 -04:00
chris meyers
929f4bfb81 start redis container with conf file 2020-04-02 11:13:35 -04:00
Shane McDonald
3060505110
Switch from StatefulSet to Deployment 
We can do this now that we dropped RabbitMQ.
 2020-04-02 09:24:49 -04:00
Armin Kunaschik
2b3c57755c
support for older jinja2 in installer 2020-03-28 02:59:40 +01:00
chris meyers
eab74cac07 autogenerate websocket secret 2020-03-26 10:32:37 -04:00
chris meyers
770b457430
redis socket support 2020-03-18 16:10:19 -04:00
chris meyers
b6b9802f9e
increase per-channel capacity 
* 100 is the default capacity for a channel. If the client doesn't read
the socket fast enough, websocket messages can and will be lost. This
increases the default to 10,000
 2020-03-18 16:10:18 -04:00
chris meyers
3c5c9c6fde
move broadcast websocket out into its own process 2020-03-18 16:10:18 -04:00
Shane McDonald
45ce6d794e
Initial migration of rabbitmq -> redis for k8s installs 2020-03-18 16:10:17 -04:00
Donovan Murphy
ed8133be2d add Service Account annotation 
Signed-off-by: Donovan Murphy <dono@dono.email>
 2020-02-19 20:29:42 -06:00
softwarefactory-project-zuul[bot]
4dee5eddeb
Merge pull request #5989 from egmar/support-for-imagePullSecrets 
Added support for K8S imagePullSecrets

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-02-19 19:45:12 +00:00
softwarefactory-project-zuul[bot]
709482bdac
Merge pull request #5980 from shanemcd/downstream_oc_changes 
properly configure AWX loggers for openshift installs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-02-19 19:35:12 +00:00
Egor Margineanu
74a31224e0 Moved imagePullSecrets into ServiceAccount definition 2020-02-19 10:45:07 +02:00
Egor Margineanu
667b27fe78 Added support for K8S imagePullSecrets 2020-02-19 10:11:34 +02:00
Donovan Murphy
5e4d73b6a3 fix indent 2020-02-18 20:27:57 -06:00
Ryan Petrello
3a95114c3a
properly configure AWX loggers for openshift installs 
see: https://github.com/ansible/tower/issues/3793
 2020-02-18 12:50:46 -05:00
Jonas DOREL
c94680eaba
Add openshift label app 2020-02-15 14:49:05 +01:00
Jake McDermott
3831efb3be
Use pod uid as instance uuid 
Inject the pod uid as an environment variable and use it for the
SYSTEM_UUID in the settings file defined by the configmap.
 2020-02-12 13:52:09 -05:00
softwarefactory-project-zuul[bot]
f4f4a7caec
Merge pull request #5851 from xelgand/devel 
k8s installer: fix warning when applying deployment

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-02-10 18:20:36 +00:00
xelgand
7b9ad1d69a k8s installer: fix warning when applying deployment 2020-02-09 16:35:10 +01:00
Bryan Hundven
7d2ed7b763 Bump stable/postgresql to 8.3.0 
https://hub.helm.sh/charts/stable/postgresql/8.3.0

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
 2020-02-07 15:07:44 -08:00
Bryan Hundven
76a6f84c70 Remove tempfile after running helm 
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
 2020-02-07 12:04:11 -08:00