Merge "New default port: 5311"

doc/source/administration/surveil_api.rst

@@ -6,7 +6,7 @@ The Surveil API provides Surveil's REST API.
 ==================================   ==========================
 **package name (RPM)**               surveil
 **services**                         surveil-api.service
-**Default port**                     8080
+**Default port**                     5311
 **configuration (API)**              /etc/surveil/surveil.cfg
 **configuration (permissions)**      /etc/surveil/policy.json
 **configuration (API - pipeline)**   /etc/surveil/api_paste.ini

doc/source/tutorials/developing_the_api.rst

@@ -23,7 +23,7 @@ After you save the file, the following logs will appear in Surveil's output: ::
     surveil_1  | Some source files have been modified
     surveil_1  | Restarting server...
 
-You should be able to test your modification by accessing ``http://localhost:8080/v2/hello`` with your browser.
+You should be able to test your modification by accessing ``http://localhost:5311/v2/hello`` with your browser.
 
 Disabling permissions
 ~~~~~~~~~~~~~~~~~~~~~

doc/source/tutorials/getting_started.rst

@@ -34,7 +34,7 @@ stored in tools/docker.
 After running :bash:`sudo docker-compose up`, you should be able to acces all
 services at the ports configured in the docker-compose.yml file.
 
-* Surveil API: http://localhost:8080/v1/hello
+* Surveil API: http://localhost:5311/v1/hello
 * Bansho (surveil web interface): http://localhost:8888 (any login info is fine)
 * InfluxDB: http://localhost:8083 (user:root pw:root)
 * Grafana: http://localhost:80 (user:admin pw:admin)
@@ -61,8 +61,8 @@ You'll need to provide the Surveil API URL. You can do this with the
 ``--surveil-api-url`` parameter, but its easier to just set it as environment
 variable::
 
-    export SURVEIL_API_URL=http://localhost:8080/v2
-    export SURVEIL_AUTH_URL=http://localhost:8080/v2/auth
+    export SURVEIL_API_URL=http://localhost:5311/v2
+    export SURVEIL_AUTH_URL=http://localhost:5311/v2/auth
 
 
 Viewing host status

docker-compose-production.yml

@@ -6,7 +6,7 @@ surveil:
    - influxdb
    - alignak
   ports:
-   - "8080:8080"
+   - "5311:5311"
   environment:
     PBR_VERSION: "PROD"
     #SURVEIL_AUTH_BACKEND: "keystone"
@@ -23,8 +23,8 @@ surveilosinterface:
     - surveil
   environment:
     PBR_VERSION: "PROD"
-    #SURVEIL_API_URL: "http://surveil:8080/v2"
-    #SURVEIL_AUTH_URL: "http://surveil:8080/v2/auth"
+    #SURVEIL_API_URL: "http://surveil:5311/v2"
+    #SURVEIL_AUTH_URL: "http://surveil:5311/v2/auth"
     #SURVEIL_VERSION: "2_0"
     #RABBIT_HOST: "192.168.49.239"
     #RABBIT_PORT: 5672
@@ -80,7 +80,7 @@ bansho:
   image: surveil/bansho:0.12.2
   environment:
     BANSHO_BACKEND: "surveil"
-    #BANSHO_SURVEIL_URL: "http://surveil:8080/"
+    #BANSHO_SURVEIL_URL: "http://surveil:5311/"
     #BANSHO_AUTH_URL: "http://198.72.123.131:5000/v2.0/"
     INFLUXDB_HOST: "influxdb"
     INFLUXDB_PORT: "8086"

docker-compose.yml

@@ -5,7 +5,7 @@ surveil:
    - influxdb
    - alignak
   ports:
-   - "8080:8080"
+   - "5311:5311"
   environment:
     PBR_VERSION: "DEV"
   volumes:
@@ -58,7 +58,7 @@ bansho:
   image: savoirfairelinux/bansho
   environment:
     BANSHO_BACKEND: "surveil"
-    BANSHO_SURVEIL_URL: "http://surveil:8080/"
+    BANSHO_SURVEIL_URL: "http://surveil:5311/"
     INFLUXDB_HOST: "influxdb"
     INFLUXDB_PORT: "8086"
     INFLUXDB_NAME: "db"

surveil/api/config.py

@@ -18,7 +18,7 @@ from surveil.api import hooks
 
 # Server Specific Configurations
 server = {
-    'port': 8080,
+    'port': 5311,
     'host': '0.0.0.0'
 }
 

surveil/cmd/init.py

@@ -127,8 +127,8 @@ def main():
             ]
         )
 
-    cli_surveil = sc.Client('http://localhost:8080/v2',
-                            auth_url='http://localhost:8080/v2/auth',
+    cli_surveil = sc.Client('http://localhost:5311/v2',
+                            auth_url='http://localhost:5311/v2/auth',
                             version='2_0')
 
     # if --demo is specified, you get more hosts.