Commit Graph

91 Commits

Author SHA1 Message Date
Thomas S Hatch
7a2973a10a Merge pull request #1540 from s0undt3ch/master
Improved logging stuff
2012-06-30 15:57:40 -07:00
Pedro Algarvio
3f6b4ac7b8 Improved logging configuration options from the configuration files.
* Added the ability to configure the log levels for the console logger separate from the logfile logger. The log level provided from the cli script will override the console log level set on the configuration file but not the logfile logger setting, unless theres no setting for the logfile setting in which case it will be the same as the console log level.
* Added the ability to provide the logging formats for both the console and the logfile.
* Added the ability to provide the date format to be used.
* The module name formatting("%(name)s") now remembers the widest name, this will improve log readability.
* Also catch `KeyboardInterrupt`s while the minion is waiting to connect to the master and not just on `minion.tune_in()`.

All these new configuration settings are documented on the configuration file templates.
2012-06-30 23:40:03 +01:00
Intchanter
5f98f6cc83 Remove 'DO NOT EDIT', as distros copy as-is. 2012-06-30 12:14:58 -06:00
Andy Sykes
fbbe74bb35 Bugfixes/documentation update for the 'include' option
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path

Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01:00
Thomas S Hatch
037013569b Add config comments for job_cache 2012-06-13 15:42:26 -06:00
Baiju Muthukadan
0dc4341a94 Fix typos in configuration templates 2012-06-09 22:05:29 +05:30
Michael Prokop
15eb31f1da Fix some typos in configuration template and manpage
* usefule -> useful
* the the -> the
* issolate -> isolate
* coppied -> copied
2012-06-07 23:18:03 +02:00
Matt Haggard
8035751678 Clarified where the top.sls file goes 2012-06-05 14:54:21 -06:00
Thomas S Hatch
459035812e Add peer_run to the master config template 2012-06-02 20:50:20 -06:00
Dax Kelson
27050174e7 Spelling fix 2012-05-24 10:48:58 -06:00
Thomas S Hatch
fbdb8649ac Add cython data on the master, Fix #1331 2012-05-21 14:33:42 -06:00
Thomas S Hatch
02485beea0 Add config data for master runner_dirs 2012-05-18 18:31:55 -06:00
Thomas S Hatch
a97d5f7b89 Add config examples for ext_pillar 2012-04-07 16:47:41 -06:00
Thomas S Hatch
b5255cff31 remove incorrect commas from the master config template, fix #1001 2012-03-25 09:48:11 -06:00
Grier Johnson
3a3db83012 Adding in append_domain config values. Allows for a harcoded domain to
be appended to minions.  This helps with systems like solaris who, by
default, give back the short name when you ask for socket.getfqdn()
2012-03-14 18:35:07 -07:00
Thomas S Hatch
2003cd7b42 Add providers blurb to minion config 2012-03-14 15:11:11 -06:00
Thomas S Hatch
c09d8547b4 Add pillar_roots to the master config 2012-03-08 15:26:44 -07:00
Thomas S Hatch
738a74f6ee iAdd pillar_roots to the minion config 2012-03-08 15:16:19 -07:00
Grier Johnson
f5642c9073 Adding Range Support to Salt
Range is a cluster based metadata store.  It was used internally at
yahoo and recently open source.  You can read about range here:

https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files

Range allows arbitrary grouping of hosts via clusters and the storage
of metadata along with them.  Additionally there is a powerful DSL that
allows for set operations, regexes, and multilayer cluster referencing.

The implementation here runs the range query and reduces it to a list
style expression format, which means only the salt master needs to know
about range or have the range libraries installed.
2012-03-06 18:26:23 -08:00
Thomas S Hatch
3e5bc4ff5a Add state_top to the minion config 2012-03-04 22:15:06 -07:00
Thomas S Hatch
fd792c1caa Add file directory settings to the minion config template 2012-03-04 21:59:39 -07:00
Thomas S Hatch
140b36b8a5 Add dns)_check to the minion config 2012-03-01 10:24:19 -07:00
Thomas S Hatch
bfdebaa21b Add timeout doc to master config 2012-02-05 22:54:24 -07:00
blast_hardcheese
50f95e24ea Tightened up configuration documentation
Fixed a couple typos, run-on sentences, and reworded a particularly
confusing section.
2012-02-03 21:17:01 -08:00
Thomas S Hatch
7e9cc5e50e Add environment to the minion config 2012-01-31 22:21:06 -07:00
Thomas S Hatch
5409ff1f43 fix typo in minion config template 2012-01-30 07:55:02 -07:00
Thomas S Hatch
d4971abf2e Add external_nodes to the config system 2012-01-25 17:01:02 -07:00
Thomas S Hatch
d113d1b442 Merge branch 'develop' of https://github.com/rubic/salt into rubic-develop 2012-01-18 14:52:42 -07:00
Jeff Bauer
30308b6a5b run salt in user space 2012-01-18 14:29:38 -06:00
Thomas S Hatch
302857aca0 Add cache_jobs to the minion config template 2012-01-17 23:59:01 -07:00
Jeff Bauer
94a8b927de added salt/config.py, setup.py changes 2012-01-16 13:36:39 -06:00
Jeff Bauer
7f30955675 rename conf files to templates, issue #518 2012-01-16 13:29:49 -06:00
Thomas S Hatch
582199a376 Add missing examples tot he config 2012-01-13 15:29:24 -07:00
Thomas S Hatch
99e7b1c704 clean up the master config a little more 2012-01-13 12:31:20 -07:00
Thomas S Hatch
b27aec6ca2 update master config with serial option 2012-01-13 11:40:32 -07:00
Byron Clark
94d022c869 root_dir is also prepended to sock_dir. 2012-01-12 21:09:12 -07:00
Brad Barden
31f7175932 very minor wording correction in config desc 2011-12-31 20:41:55 -06:00
Brad Barden
3bec12e5b7 updated description of acceptance_wait_time 2011-12-31 20:31:06 -06:00
Brad Barden
54c4eefcdb add acceptance_wait_time minion config parameter 2011-12-31 19:53:07 -06:00
Chris Scheller
47703d6b87 using compound targets for the groups now 2011-12-16 10:16:44 -05:00
Chris Scheller
b725c2d884 merge of upstream/develop to bring in compound target support 2011-12-13 14:24:59 -05:00
Thomas S Hatch
3a32864e9a Add state_verbose: False option to make states less chatty 2011-12-10 00:15:57 -07:00
Chris Scheller
3a9bb45e35 example format of the groups in the master config 2011-12-07 13:43:21 -05:00
Corey Quinn
5e404e8674 Fixed a typo or two 2011-11-26 16:15:43 -08:00
Thomas S Hatch
e9b048d5b4 add failhard to the master config file 2011-11-24 00:22:31 -07:00
Thomas S Hatch
862cf236c4 update minion config with new sub_timeout option 2011-10-24 22:48:55 -06:00
Thomas S Hatch
f6c3c31e31 Disable Cython module loading by default 2011-09-14 17:14:56 -06:00
Thomas S Hatch
b720b200a1 Add syndic data to the default config 2011-08-27 11:08:59 -06:00
Thomas S Hatch
a2363eca76 update the master config file 2011-08-27 08:51:38 -06:00
Erik Nolte
1d71c9ce19 Move remaining salt-monitor code to the salt-monitor project 2011-08-10 13:54:38 -06:00