Commit graph

395 commits

Author SHA1 Message Date
Ivo Verberk 1d294df9ec Bring up-to-date with master 2015-12-19 21:55:10 +01:00
Alex Dadgar 55cc8c61b3 fix 2015-12-18 12:17:50 -08:00
Alex Dadgar 31c3e12957 merge 2015-12-18 12:17:13 -08:00
Alex Dadgar 06e84205da Fix retry interval not applying sleep duration 2015-12-17 16:33:09 -08:00
Jakub Paweł Głazik a5954e1369 small refactor 2015-12-17 23:53:33 +01:00
Chris Hines 8483a0dd40 Sort config files as documented. 2015-12-15 02:05:25 -05:00
Alex Dadgar af0e9b1477 Merge pull request #585 from hashicorp/b-config-oboe
Check length 0 (no configs) instead of 1 (some configs)
2015-12-14 17:58:55 -08:00
Chris Bednarski 40d2eb0628 Check length 0 (no configs) instead of 1 (some configs) 2015-12-14 17:46:52 -08:00
Chris Hines e600f4ef19 Use minimum OS specific path.
This change ensures LoadConfig and LoadConfigDir report consistent paths to files and those paths use the appropriate path separator for the target OS. Note that LoadConfigDir constructs paths with filepath.Join, which calls filepath.Clean, which calls filepath.FromSlash.
2015-12-14 14:59:19 -05:00
Ivo Verberk acbbaf3e78 Allow lookups based on short identifiers
This change introduces the ability to specify identifiers for jobs,
allocs, evals and nodes on the command line with as little as one
character, provided that it uniquely identifies the resource. An error
with the possible results will be provided when the short identifier
has multiple results.
2015-12-12 18:28:20 +01:00
Jakub Paweł Głazik fb961939ae Sort output of agent-info 2015-12-12 13:39:16 +01:00
Alex Dadgar b943c6e278 Remove all calls to the default logger 2015-12-11 15:02:13 -08:00
Chris Bednarski 188b495ffe Merge pull request #557 from hashicorp/b-config-test-windows
Fix a failing test on windows because of / vs. \ in string comparison
2015-12-10 15:29:40 -08:00
Chris Bednarski 545f0ff120 Move raw_exec enabled into the DevMode config block 2015-12-10 15:24:21 -08:00
Chris Bednarski a86e62b6cc Use filepath.FromSlash so the test uses platform-specific path separators 2015-12-10 12:22:41 -08:00
Chris Bednarski b85b5dbf9d Added message when no configuration files are loaded 2015-12-09 15:50:18 -08:00
Alex Dadgar 7c76e8eca3 Merge pull request #527 from asteris-llc/master
Add cluster join command line options and configuration options
2015-12-09 13:14:00 -08:00
Chris Bednarski ed4160f6fe Merge pull request #536 from hashicorp/f-log-config-files
Log the list of config files loaded when starting the nomad agent
2015-12-09 12:18:46 -08:00
Chris Bednarski 3a8a30c7d8 Merge pull request #535 from hashicorp/f-warn-unused-config
Warn the user when they specify a config file / folder that doesn't add any configuration options
2015-12-09 12:10:19 -08:00
Chris Aubuchon e13dc345be Indicate which configuration option failed to parse properly 2015-12-09 13:07:36 -06:00
Chris Aubuchon 157baabb67 Move retryJoin error channel to Command structure 2015-12-09 09:57:54 -06:00
Alex Dadgar f8dff3bab0 Merge pull request #526 from ChrisHines/windows-agent
command/agent: fix tests on Windows
2015-12-08 19:11:08 -08:00
Diptanu Choudhury aeb68bb9e6 Merge pull request #548 from hooklift/x-code-clean-up
Cleans up some code.
2015-12-09 01:26:37 +01:00
Camilo Aguilar 225db55be6 Addresses Go lint suggestions 2015-12-08 19:05:15 -05:00
Camilo Aguilar 2b2777d2fd Sets default syslog facility
As advertised by documentation.
2015-12-08 18:57:06 -05:00
Chris Bednarski 02be0eeb36 Add test to verify order 2015-12-04 17:12:47 -08:00
Chris Bednarski c2a52270a7 Rename ConfigFiles field to Files so there's less stutter when used as config.Files 2015-12-04 16:59:04 -08:00
Chris Bednarski 4b52a370f9 Log the list of config files loaded when starting the nomad agent 2015-12-04 16:52:17 -08:00
Chris Bednarski e5fd0d1d62 Warn the user when they specify a config file / folder that doesn't add any configuration options 2015-12-02 23:22:18 -08:00
Chris Aubuchon 3a58bae865 Restore AtlasConfig 2015-12-02 18:40:30 -06:00
Chris Aubuchon baf0b54037 30 * time.Second -> "30s" in DefaultConfig 2015-12-02 16:05:05 -06:00
Chris Aubuchon ad9971cc02 Set defaults for retry_max and retry_interval options 2015-12-02 15:50:57 -06:00
Chris Aubuchon 62e11bddd7 Add cluster join command line options and configuration options 2015-12-02 13:55:29 -06:00
Chris Hines c20e9bff26 Do not leak listeners in test. 2015-12-02 13:59:27 -05:00
Chris Hines b05610a24d Work around bugs in package net in Go < 1.6. 2015-12-02 13:57:40 -05:00
Ryan Uber deba4009b4 Merge pull request #520 from hashicorp/f-atlas
agent: apply merges for atlas config
2015-11-30 15:33:07 -08:00
Ryan Uber 4d0322de99 agent: apply merges for atlas config 2015-11-30 15:21:50 -08:00
Diptanu Choudhury 9139078241 Updated the example nomad job spec to use task group name in the service name 2015-11-26 23:27:33 -08:00
Ryan Uber 714450c6a5 website: document regions endpoint 2015-11-24 09:38:07 -08:00
Ryan Uber a230a70cc7 nomad: testing region list 2015-11-23 22:27:07 -08:00
Ryan Uber ad6b55a37a nomad: support listing regions 2015-11-23 22:27:03 -08:00
Alex Dadgar f84fc88b60 Register gob type and remove slicetype 2015-11-18 15:26:38 -08:00
Diptanu Choudhury 1672252226 Autogenerating names of service 2015-11-17 16:05:03 -08:00
Diptanu Choudhury eb19967ce4 Added the parsling logic for service blocks 2015-11-17 15:13:25 -08:00
Diptanu Choudhury f8ce6fb901 Added the example for service block 2015-11-17 15:13:25 -08:00
Diptanu Choudhury 03ec9e980c Merge pull request #415 from hashicorp/f-port-labels
Implemented Port Labeling and Driver Configurations
2015-11-16 22:37:21 -05:00
Alex Dadgar fcdca39c5e fix arg check 2015-11-16 18:44:37 -08:00
Alex Dadgar 1f0022ce75 Review fixes 2015-11-16 18:37:38 -08:00
Alex Dadgar 907d3c2bb6 Add docs 2015-11-16 18:36:13 -08:00
Alex Dadgar 5b41f0bbf0 Get rid of incorrect length check 2015-11-16 18:21:51 -08:00
Alex Dadgar 86f30492ec Display task information 2015-11-16 18:09:00 -08:00
Diptanu Choudhury b083a3f307 Fixed the parsing and encoding logic 2015-11-16 13:10:57 -08:00
Diptanu Choudhury 0126c80961 Adding the port hcl object to example 2015-11-16 13:10:57 -08:00
Mitchell Hashimoto 9b2b6cd44f command/agent: use new HCL API 2015-11-09 11:49:27 -08:00
Alex Dadgar f210fcd1a6 Merge pull request #380 from hashicorp/f-daemonize
Improve spawn-daemon and Nomad Client usage of it
2015-11-04 16:44:50 -08:00
Alex Dadgar 81140f8787 Check if the PID is alive instead of heartbeating through modify time 2015-11-04 14:50:44 -08:00
Alex Dadgar 5562fc7672 Create Spawn pkg that handles IPC with the spawn-daemon and update exec_linux to use that 2015-11-02 20:28:37 -08:00
Diptanu Choudhury 1f4593c4d3 Fixed the restart policy syntax 2015-11-02 17:30:41 -08:00
Diptanu Choudhury 8133aa413a Fixed grammer of comment 2015-10-30 21:06:56 -07:00
Diptanu Choudhury c883f9496a Added support for parsing restart blocks 2015-10-30 15:51:39 -07:00
Diptanu Choudhury c0d37ce58c Setting the default network interface for dev mode only in Linux and Darwin 2015-10-29 17:03:54 -07:00
Alex Dadgar f2bbc0dd6b Merge pull request #362 from gregory-m/node-gc-conf
Configure Node GC Threshold
2015-10-29 15:45:57 -07:00
Alex Dadgar ec2367baec Cleanup exec_linux, force cgroups, check for systemd and update the Open() api 2015-10-29 15:26:35 -07:00
Gregory Man 8f178b54d3 Added node_gc_threshold configuration option
Close #333
2015-10-29 15:58:21 +02:00
Gregory Man af4e123a89 Fix local interface name on OS X 2015-10-29 14:30:26 +02:00
Alex Dadgar 5b1d6ed985 Refactor spawn-daemon so it can be used by all OSes and make it write exit code to a file 2015-10-28 16:23:33 -07:00
Kenjiro Nakayama e688dc3826 Set default network interface rather than eth0 for non-dev mode, and use loopback device for dev mode by default 2015-10-28 02:03:48 +09:00
Gregory Man 1af62592c1 Sort server-members output using name and tags 2015-10-23 21:33:18 +03:00
Abhishek Chanda 70dab4ba6a Show node attribute in node-status
Adds node attributes to the node-status command when a single
node ID is passed
2015-10-22 10:34:21 +00:00
Ivo Verberk c6e1b13b51 Fix vet warnings 2015-10-07 12:26:58 +02:00
Chris Bednarski c479e76da5 Merge pull request #203 from hashicorp/b-init-redis-port
Change to the default redis port and use docker port mapping
2015-10-06 00:36:38 -07:00
Alex Dadgar 4cc8588cb5 Merges 2015-10-02 17:32:11 -07:00
Ryan Uber ccf217ce2e agent: test options config 2015-10-02 17:02:32 -07:00
Ryan Uber 30fa300825 Merge branch 'parse-client-options' of https://github.com/carlosdp/nomad into b-options 2015-10-02 16:58:05 -07:00
Chris Bednarski e9ee102ceb Change to the default redis port and use docker port mapping 2015-10-02 16:35:24 -07:00
Antoine POPINEAU f35ebe14ad Merge branch 'master' into dev/net-fingerprint 2015-10-02 09:38:35 +02:00
Antoine POPINEAU 36daef1625 Renamed all instances of Iface to NetworkInterface. 2015-10-02 09:29:18 +02:00
Alex Dadgar cc85859ccd Don't enfoce that the agent can't be run as both server and client 2015-10-01 17:27:36 -07:00
Alex Dadgar 4c9f2fd6a7 Use the known size of meta to initialize the map 2015-10-01 17:21:32 -07:00
Alex Dadgar 9d5f96fb4f Move declerations to top and use SplitN to be more flexible for Meta values 2015-10-01 17:19:52 -07:00
Alex Dadgar 3345a951d2 Add parsing of client configuration from the commandline 2015-10-01 16:46:42 -07:00
Antoine POPINEAU 70d34da1bc Client config param added to specify net iface to use for fingerprinting. Added a Golang-native method for determining the interface IP address. 2015-10-01 17:31:47 +02:00
Ryan Uber 2692a39c96 command: test init 2015-09-30 14:21:50 -07:00
Ryan Uber 7bb41d2f21 agent: return empty config for empty config dirs 2015-09-29 15:07:52 -07:00
Dave York ff2b331192 fixes another typo
- Ui should be UI
2015-09-29 17:16:55 -04:00
ziporah b9833d627c Changed typo in documentation 2015-09-28 19:51:29 -07:00
Carlos Diaz-Padron 1c6ca9b0a4 Parse Client config Options
This adds Options to the agent ClientConfig and fixes the merging logic
to include Options, as defined in the docs
2015-09-28 16:45:32 -07:00
Ryan Uber 8c992355c4 Merge pull request #128 from hashicorp/f-alloc-status
Add alloc-status command
2015-09-27 15:06:17 -07:00
Ryan Uber 53e676f42a command: better test for alloc-status 2015-09-27 14:42:04 -07:00
Ryan Uber 079b3c753a command: placeholder for <none> in kv output 2015-09-27 14:04:53 -07:00
Ryan Uber 5ce6f4bb64 command: better output for alloc-status 2015-09-27 13:59:27 -07:00
Ryan Uber 3d771c5780 command: first pass at alloc-status command 2015-09-27 12:02:14 -07:00
Armon Dadgar 91e69c5973 website: lowercase examples of dynamic ports 2015-09-26 18:26:51 -07:00
Alex Dadgar 0f855e2088 Fix cgroup isolation 2015-09-25 16:49:18 -07:00
Alex Dadgar 3cea4288b9 Merge qemu test 2015-09-25 16:49:14 -07:00
Ryan Uber cc7c1cc808 agent: all dynamic ports for tests 2015-09-25 12:19:13 -07:00
Ryan Uber a7757436c9 Merge pull request #114 from hashicorp/f-clients
Make servers list configurable on clients
2015-09-25 12:03:21 -07:00
Ryan Uber 65a89dffae command: rename client-servers -> client-config 2015-09-25 11:49:31 -07:00
Ryan Uber 052aa8b56e command: fix help 2015-09-24 22:01:41 -07:00
Ryan Uber f084d22047 command: adding client-servers command 2015-09-24 21:32:12 -07:00
Ryan Uber 114b38b8a8 agent: add HTTP endpoint for querying/modifying the server list 2015-09-24 20:39:03 -07:00
Armon Dadgar 77a9e52449 command/validate: Adding new command 2015-09-24 18:29:46 -07:00
Chris Bednarski 1654d08fca Add docker ports; change to uppercase examples and tests 2015-09-23 18:01:08 -07:00
Armon Dadgar c57012105c command/init: tweak constraint 2015-09-22 21:48:44 -07:00
Armon Dadgar 692e10603f command/run: update synopsis 2015-09-22 21:48:44 -07:00
Armon Dadgar b7f1447d4b command/run: update help output 2015-09-22 21:48:43 -07:00
Armon Dadgar 461df354e1 command/init: fixing inconsistencies 2015-09-22 21:48:43 -07:00
Armon Dadgar cf62f158fc command/node-status: removing extra formating input 2015-09-22 21:48:43 -07:00
Armon Dadgar 8257c243b1 command/init: reworking behavior and default file 2015-09-22 21:48:43 -07:00
Armon Dadgar 683985c872 agent: Do not override default log levels 2015-09-22 21:48:42 -07:00
Ryan Uber dd95f4033d Merge pull request #79 from hashicorp/f-bootstrap
Add flags for bootstrap modes to CLI
2015-09-22 20:28:30 -07:00
Ryan Uber f0c21b79f1 agent: json decode directly to structs in api 2015-09-22 20:02:10 -07:00
Chris Bednarski 0da7a2c83b Switch to named port config syntax 2015-09-22 16:14:28 -07:00
Chris Bednarski 48a875a702 Added init command 2015-09-22 16:11:01 -07:00
Ryan Uber e5f644b02c agent: remove explicit Bootstrap option in favor of BootstrapExpect 2015-09-22 14:41:49 -07:00
Ryan Uber e1a6c02004 agent: test agent command args 2015-09-22 14:04:40 -07:00
Ryan Uber 16f4e1c8c2 command/agent: add bootstrap flags 2015-09-22 13:28:06 -07:00
Armon Dadgar 38f9508764 agent: test config parsing 2015-09-22 11:29:58 -07:00
Ryan Uber 0958c731a9 command: rename some agent commands to use a server- prefix 2015-09-22 11:01:41 -07:00
Ryan Uber 5fdc10befc command/monitor: set initial status to 'pending' 2015-09-22 10:45:08 -07:00
Ryan Uber 306a6dc81f command: print a warning if we get 0 evaluated nodes 2015-09-22 10:45:08 -07:00
Ryan Uber 75c79b705e command: monitor output updates 2015-09-22 10:45:08 -07:00
Ryan Uber 0e36424c6e command/run: validate job before submission 2015-09-22 10:45:08 -07:00
Ryan Uber d7f3697e5d command: adjustments to monitor logs 2015-09-22 10:45:07 -07:00
Ryan Uber cf8fe7e8d7 command: remove unnecessary alloc-status command 2015-09-22 10:45:07 -07:00
Ryan Uber 6f8d0040f9 command: return 2 for scheduling failures when using monitor 2015-09-22 10:45:07 -07:00
Ryan Uber f1020c8a0b command: fix alloc-status tests 2015-09-22 10:45:07 -07:00
Ryan Uber aa8bee0cfa command: allocation monitor adjustments 2015-09-22 10:45:07 -07:00
Ryan Uber 277e5ae8d6 command: simplify alloc status, dump during job run 2015-09-22 10:45:07 -07:00
Ryan Uber c796157278 command/status: don't display node ID in evaluations 2015-09-22 10:45:07 -07:00
Ryan Uber fd61e29d01 command/monitor: dump info regardless of initial status 2015-09-22 10:45:07 -07:00
Ryan Uber ac70a19ea5 command: spelling 2015-09-22 10:45:07 -07:00
Ryan Uber 84a5de4e02 command: start alloc-status command 2015-09-22 10:45:07 -07:00
Ryan Uber c5ab58761b command/status: cleanup 2015-09-22 10:45:07 -07:00
Ryan Uber b4c9f2ea7c command/monitor: cleanup 2015-09-22 10:45:07 -07:00
Ryan Uber 0908337ac8 command/monitor: display scheduling errors 2015-09-22 10:45:06 -07:00
Ryan Uber 646612175d command: enter monitor mode by default 2015-09-22 10:45:06 -07:00
Ryan Uber 435fd7038b command/monitor: handle more alloc state changes 2015-09-22 10:45:06 -07:00
Ryan Uber e3611a1694 command/monitor: account for updated allocations 2015-09-22 10:45:06 -07:00
Ryan Uber a532acaa79 command/monitor: more tests 2015-09-22 10:45:06 -07:00
Ryan Uber 3384fb5769 command/monitor: tests 2015-09-22 10:45:06 -07:00
Ryan Uber 5df780ccc5 command: only use prefixed UI during monitoring 2015-09-22 10:45:06 -07:00
Ryan Uber 099fd00760 command/stop: inital stop command 2015-09-22 10:45:06 -07:00
Ryan Uber bb2a11d004 command/monitor: cleanup 2015-09-22 10:45:06 -07:00
Ryan Uber c6fd98b11b command: easier exit codes, check if eval is already finished 2015-09-22 10:45:06 -07:00
Ryan Uber e4b7aa1e3a command: add prefixed output for monitor commands 2015-09-22 10:45:06 -07:00
Ryan Uber 104cd67cff command: adding eval-monitor 2015-09-22 10:45:05 -07:00
Ryan Uber 3258f16568 command: monitor allocation client status updates 2015-09-22 10:45:05 -07:00
Ryan Uber 8db83e71e0 command: working on monitor 2015-09-22 10:45:05 -07:00
Ryan Uber bd40b1f5ad command: start implementing eval monitoring for run 2015-09-22 10:45:05 -07:00
Ryan Uber 43a33dd054 command: add primitive run command 2015-09-22 10:45:05 -07:00
Ryan Uber b15d45fa2b command: use an empty config instead of default config for cli options 2015-09-22 10:44:46 -07:00
Armon Dadgar bb58ba2705 website: document additional configuration options 2015-09-22 10:41:12 -07:00
Ryan Uber dbf60d4682 command/agent: fix help usage 2015-09-22 01:59:17 -07:00
Ryan Uber 0e54398200 command/agent: more arguments 2015-09-21 21:37:55 -07:00
Ryan Uber d734dedb54 command/agent: accept server/client/data-dir 2015-09-21 20:48:39 -07:00
Ryan Uber 3df6f52e96 agent: fix CLI help 2015-09-21 20:39:10 -07:00
Alex Dadgar 33117772b7 Merge pull request #75 from hashicorp/h-spawn-daemon-build-dep
Make spawn-daemon only defined on linux
2015-09-21 17:27:08 -07:00
Alex Dadgar 96b81124bf Make spawn-daemon only defined on linux 2015-09-21 15:24:08 -07:00
Armon Dadgar 6fb7d45acf agnet: fixing inversion of LeaveOnInt 2015-09-21 14:14:19 -07:00
Armon Dadgar 0621b2e2df agent: adding Atlas and Region to output 2015-09-21 14:14:19 -07:00
Alex Dadgar 0e3f21b34f Linux executor with cgroup isolation support 2015-09-21 09:08:57 -07:00
Armon Dadgar 0074270c45 http: validating job is provided to avoid nil pointer 2015-09-20 17:38:26 -07:00
Ryan Uber 02529aee52 command: fix tests after job validation 2015-09-16 11:42:28 -07:00
Ryan Uber e98307bd46 command: final adjustments for list output 2015-09-15 16:51:17 -07:00
Ryan Uber 1299fabf1f command: helpers for columns 2015-09-15 16:44:38 -07:00
Ryan Uber c577cd2143 command: output adjustments 2015-09-15 13:21:49 -07:00
Ryan Uber 1aac77c452 command: testing alloc/eval dump and short mode for status 2015-09-15 12:53:13 -07:00
Ryan Uber 8a25ca10a7 command: add evals/allocs to status command, add -short flag 2015-09-15 11:35:38 -07:00
Ryan Uber dd4e804d7e command: dump allocations for nodes in node-status 2015-09-15 11:20:08 -07:00
Ryan Uber 6af11360f3 command: separate k/v pairs with an '=' 2015-09-14 20:29:08 -07:00
Armon Dadgar 53834b39ba SCADA support 2015-09-14 15:33:08 -07:00
Ryan Uber 709c04dbde command: tests 2015-09-14 14:08:50 -07:00
Ryan Uber 4eddeebc9b command: guard tests from multiple parallel calls 2015-09-14 14:06:37 -07:00
Ryan Uber 7b5fd8a214 command: use meta struct for common options 2015-09-14 13:24:03 -07:00
Ryan Uber bfb60d6a06 command: kill AllAtOnce in job list mode 2015-09-14 13:24:03 -07:00
Ryan Uber 18745e6e68 command: cleanup 2015-09-14 13:24:03 -07:00
Ryan Uber c6fdb6060a command: add node-drain command 2015-09-14 13:24:03 -07:00
Ryan Uber 1183f0f270 command: more cli tests 2015-09-14 13:24:03 -07:00
Ryan Uber c363bc95f5 command: use testutil.TestServer in command tests 2015-09-14 13:24:03 -07:00
Ryan Uber b40d6715f6 command: cli tests 2015-09-14 13:24:03 -07:00
Ryan Uber 578934fb17 command: fix test agent helper 2015-09-14 13:24:03 -07:00
Ryan Uber be3e081dec command: add node-status command 2015-09-14 13:24:03 -07:00
Ryan Uber 3118043a4c command: add agent-join command 2015-09-14 13:24:03 -07:00
Ryan Uber 92c2c58a37 command: convert members so we get a descriptive status 2015-09-14 13:24:03 -07:00
Ryan Uber 8053570f18 command: adding agent-members command 2015-09-14 13:24:03 -07:00
Ryan Uber 7cdaf95f4e command: add agent-force-leave command 2015-09-14 13:24:02 -07:00
Ryan Uber fe245396d1 command: tests 2015-09-14 13:24:02 -07:00
Ryan Uber f0ee34651a command: add agent-info command 2015-09-14 13:24:02 -07:00
Ryan Uber b047700788 command: unexport helpers 2015-09-14 13:24:02 -07:00
Ryan Uber 1b026abf08 command: adjustments for status 2015-09-14 13:24:02 -07:00
Ryan Uber a307f9b688 command: basic status command 2015-09-14 13:24:02 -07:00
Ryan Uber 4d5901c1ae command: add helpers 2015-09-14 13:24:02 -07:00
Armon Dadgar 2ff133c0e6 nomad: rename region1 to global. Fixes #41 2015-09-13 18:18:40 -07:00
Ryan Uber f4499491a9 agent: remove unreachable code 2015-09-11 21:28:35 -07:00
Ryan Uber 90f18850a5 agent: add default bind addr and port numbers 2015-09-11 12:19:05 -07:00
Ryan Uber 3b5004f2a4 agent: split out server config parser, add tests 2015-09-11 12:06:42 -07:00
Ryan Uber 8d816ec883 agent: allow specifying advertise addrs in ip:port format 2015-09-11 11:27:14 -07:00
Ryan Uber 9ce9552a6b agent: test listener from config 2015-09-11 11:10:55 -07:00
Ryan Uber fa614cd3ef agent: adjust tests 2015-09-10 19:04:06 -07:00