Merge pull request #2136 from Azure/release-2.2.53

Merge release 2.2.53 to master

.travis.yml

@@ -3,41 +3,62 @@ os: linux
 dist: xenial
 language: python
 env:
-  - NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
-  # Add SETUPOPTS="check flake8" to enable flake8 checks
+  - >-
+    NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
 
 matrix:
   # exclude the default "python" build - we're being specific here...
   exclude:
     - python:
       env:
-        - NOSEOPTS="" SETUPOPTS="check flake8"
+        - NOSEOPTS="" SETUPOPTS=""
 
   include:
     - python: 2.6
       dist: trusty
       env:
         - NOSEOPTS="--verbose" SETUPOPTS=""
     - python: 2.7
+      env:
+        - >-
+          NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
+          PYLINTOPTS="--rcfile=ci/2.7.pylintrc"
+          PYLINTFILES="azurelinuxagent setup.py makepkg.py tests"
     - python: 3.4
+      env:
+        - >-
+          NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
+          PYLINTOPTS="--rcfile=ci/2.7.pylintrc"
+          PYLINTFILES="azurelinuxagent setup.py makepkg.py tests"
     - python: 3.6
+      env:
+        - >-
+          NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
+          PYLINTOPTS="--rcfile=ci/3.6.pylintrc"
+          PYLINTFILES="azurelinuxagent setup.py makepkg.py tests"
     - python: 3.7
+      env:
+        - >-
+          NOSEOPTS="--verbose --with-timer" SETUPOPTS=""
+          PYLINTOPTS="--rcfile=ci/3.6.pylintrc"
+          PYLINTFILES="azurelinuxagent setup.py makepkg.py tests"
     - python: 3.8
       env:
         - >-
           NOSEOPTS="--verbose --with-coverage --with-timer --cover-inclusive
           --cover-min-percentage=60 --cover-branches
           --cover-package=azurelinuxagent --cover-xml"
           SETUPOPTS=""
+          PYLINTOPTS="--rcfile=ci/3.6.pylintrc"
+          PYLINTFILES="azurelinuxagent setup.py makepkg.py tests"
 
 install:
   - pip install -r requirements.txt
   - pip install -r test-requirements.txt
 
 script:
-  # future: - pylint setup.py makepkg.py azurelinuxagent/
-  - nosetests $NOSEOPTS --attr '!requires_sudo' tests
-  - sudo env "PATH=$PATH" nosetests $NOSEOPTS --verbose --attr 'requires_sudo' tests
+  - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then ./ci/pylint_and_nosetests.sh; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then ./ci/nosetests_only.sh; fi
   - if [ ! -z "$SETUPOPTS" ]; then /usr/bin/env python setup.py $SETUPOPTS; fi
 
 after_success:

README.md

@@ -82,7 +82,7 @@ authentication.
 
 The following systems have been tested and are known to work with the Azure
 Linux Agent.  Please note that this list may differ from the official list
-of supported systems on the Microsoft Azure Platform as described [here](http://support.microsoft.com/kb/2805216).
+of supported systems on the Microsoft Azure Platform as described [here](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/endorsed-distros).
 
 Waagent depends on some system packages in order to function properly:
 
@@ -106,6 +106,12 @@ For more advanced installation options, such as installing to custom locations o
     sudo python setup.py install --register-service
 ```
 
+For Python 3, use:
+
+```bash
+    sudo python3 setup.py install --register-service
+```
+
 You can view more installation options by running:
 
 ```bash
@@ -174,6 +180,8 @@ For CoreOS, use:
 
 `-start`: Run waagent as a background process
 
+`-collect-logs [-full]`: Runs the log collector utility that collects relevant agent logs for debugging and stores them in the agent folder on disk. Exact location will be shown when run. Use flag `-full` for more exhaustive log collection. 
+
 ## Configuration
 
 A configuration file (/etc/waagent.conf) controls the actions of waagent. Blank lines and lines whose first character is a `#` are ignored (end-of-line comments are *not* supported).
@@ -201,6 +209,8 @@ ResourceDisk.EnableSwap=n
 ResourceDisk.EnableSwapEncryption=n
 ResourceDisk.SwapSizeMB=0
 Logs.Verbose=n
+Logs.Collect=n
+Logs.CollectPeriod=3600
 OS.AllowHTTP=n
 OS.RootDeviceScsiTimeout=300
 OS.EnableFIPS=n
@@ -258,6 +268,19 @@ How often to clean up the history folder of the agent. The agent keeps past goal
 states on this folder, each goal state represented with a set of small files. The
 history is useful to debug issues in the agent or extensions.
 
+#### __AutoUpdate.Enabled__
+
+_Type: Boolean_  
+_Default: y_
+
+Enables auto-update of the Extension Handler. The Extension Handler is responsible 
+for managing extensions and reporting VM status. The core functionality of the agent
+is contained in the Extension Handler, and we encourage users to enable this option 
+in order to maintain an up to date version.
+
+On most distros the default value is 'y'.
+
+For more information on the agent version, see our [FAQ](https://github.com/Azure/WALinuxAgent/wiki/FAQ#what-does-goal-state-agent-mean-in-waagent---version-output).
 
 #### __Provisioning.Agent__
 
@@ -450,6 +473,23 @@ _Default: n_
 If set, log verbosity is boosted. Waagent logs to /var/log/waagent.log and
 leverages the system logrotate functionality to rotate logs.
 
+
+#### __Logs.Collect__
+
+_Type: Boolean_  
+_Default: n_
+
+If set, agent logs will be periodically collected and uploaded to a secure location for improved supportability.
+
+#### __Logs.CollectPeriod__
+
+_Type: Integer_  
+_Default: 3600_
+
+This configures how frequently to collect and upload logs. Default is each hour.
+
+NOTE: This only takes effect if the Logs.Collect option is enabled.
+
 #### __OS.AllowHTTP__
 
 _Type: Boolean_