From 4876279a01e96525cc2615086c5a3bf36f6c3dd1 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 15:43:45 -0500 Subject: [PATCH] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://my-token.com (200) with 1 occurrences could not be migrated: ([https](https://my-token.com) result ConnectTimeoutException). * [ ] http://xslthl.sf.net (301) with 4 occurrences could not be migrated: ([https](https://xslthl.sf.net) result AnnotatedConnectException). * [ ] http://exslt.org/common (404) with 1 occurrences could not be migrated: ([https](https://exslt.org/common) result SSLHandshakeException). * [ ] http://data-flow-server-dpvuo77-stocks-http.apps.scdf-gcp.springapps.io/ (502) with 1 occurrences could not be migrated: ([https](https://data-flow-server-dpvuo77-stocks-http.apps.scdf-gcp.springapps.io/) result SSLHandshakeException). These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://192.168.64.1:23057 (ConnectTimeoutException) with 1 occurrences migrated to: https://192.168.64.1:23057 ([https](https://192.168.64.1:23057) result ConnectTimeoutException). * [ ] http://192.168.64.1:60081 (ConnectTimeoutException) with 1 occurrences migrated to: https://192.168.64.1:60081 ([https](https://192.168.64.1:60081) result ConnectTimeoutException). * [ ] http://dataflow-server.local.pcfdev.io (ConnectTimeoutException) with 1 occurrences migrated to: https://dataflow-server.local.pcfdev.io ([https](https://dataflow-server.local.pcfdev.io) result ConnectTimeoutException). * [ ] http://www.w3.org/2000/09/xmldsig (ReadTimeoutException) with 2 occurrences migrated to: https://www.w3.org/2000/09/xmldsig ([https](https://www.w3.org/2000/09/xmldsig) result SSLException). * [ ] http://.../pulse (UnknownHostException) with 3 occurrences migrated to: https://.../pulse ([https](https://.../pulse) result UnknownHostException). * [ ] http://cassandrastream-http.app.io (UnknownHostException) with 1 occurrences migrated to: https://cassandrastream-http.app.io ([https](https://cassandrastream-http.app.io) result UnknownHostException). * [ ] http://dataflow-server.app.io (UnknownHostException) with 3 occurrences migrated to: https://dataflow-server.app.io ([https](https://dataflow-server.app.io) result UnknownHostException). * [ ] http://dataflow.local:8080/uaa/check_token (UnknownHostException) with 2 occurrences migrated to: https://dataflow.local:8080/uaa/check_token ([https](https://dataflow.local:8080/uaa/check_token) result UnknownHostException). * [ ] http://dataflow.local:8080/uaa/oauth/authorize (UnknownHostException) with 2 occurrences migrated to: https://dataflow.local:8080/uaa/oauth/authorize ([https](https://dataflow.local:8080/uaa/oauth/authorize) result UnknownHostException). * [ ] http://dataflow.local:8080/uaa/oauth/token (UnknownHostException) with 2 occurrences migrated to: https://dataflow.local:8080/uaa/oauth/token ([https](https://dataflow.local:8080/uaa/oauth/token) result UnknownHostException). * [ ] http://dataflow.local:8080/uaa/userinfo (UnknownHostException) with 2 occurrences migrated to: https://dataflow.local:8080/uaa/userinfo ([https](https://dataflow.local:8080/uaa/userinfo) result UnknownHostException). * [ ] http://link.to/icon.jpg (UnknownHostException) with 1 occurrences migrated to: https://link.to/icon.jpg ([https](https://link.to/icon.jpg) result UnknownHostException). * [ ] http://my-auth.com (UnknownHostException) with 2 occurrences migrated to: https://my-auth.com ([https](https://my-auth.com) result UnknownHostException). * [ ] http://mysqlstream-http.app.io (UnknownHostException) with 2 occurrences migrated to: https://mysqlstream-http.app.io ([https](https://mysqlstream-http.app.io) result UnknownHostException). These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://cassandra.apache.org/ with 1 occurrences migrated to: https://cassandra.apache.org/ ([https](https://cassandra.apache.org/) result 200). * [ ] http://cloud.spring.io/spring-cloud-dataflow/ with 14 occurrences migrated to: https://cloud.spring.io/spring-cloud-dataflow/ ([https](https://cloud.spring.io/spring-cloud-dataflow/) result 200). * [ ] http://cloud.spring.io/spring-cloud-function/ with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-function/ ([https](https://cloud.spring.io/spring-cloud-function/) result 200). * [ ] http://cloud.spring.io/spring-cloud-task/ with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-task/ ([https](https://cloud.spring.io/spring-cloud-task/) result 200). * [ ] http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/ with 8 occurrences migrated to: https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/ ([https](https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/) result 200). * [ ] http://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/ with 2 occurrences migrated to: https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/ ([https](https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/) result 200). * [ ] http://docs.spring.io/spring-cloud-stream/docs/ with 1 occurrences migrated to: https://docs.spring.io/spring-cloud-stream/docs/ ([https](https://docs.spring.io/spring-cloud-stream/docs/) result 200). * [ ] http://example.com/ with 2 occurrences migrated to: https://example.com/ ([https](https://example.com/) result 200). * [ ] http://geode.apache.org with 1 occurrences migrated to: https://geode.apache.org ([https](https://geode.apache.org) result 200). * [ ] http://geode.apache.org/ with 1 occurrences migrated to: https://geode.apache.org/ ([https](https://geode.apache.org/) result 200). * [ ] http://kafka.apache.org/downloads.html with 5 occurrences migrated to: https://kafka.apache.org/downloads.html ([https](https://kafka.apache.org/downloads.html) result 200). * [ ] http://projects.spring.io/spring-batch/ with 1 occurrences migrated to: https://projects.spring.io/spring-batch/ ([https](https://projects.spring.io/spring-batch/) result 200). * [ ] http://prometheus.io with 3 occurrences migrated to: https://prometheus.io ([https](https://prometheus.io) result 200). * [ ] http://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc/images/micrometer-arch.png with 1 occurrences migrated to: https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc/images/micrometer-arch.png ([https](https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc/images/micrometer-arch.png) result 200). * [ ] http://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-skipper-server/2.0.0.BUILD-SNAPSHOT/spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar with 1 occurrences migrated to: https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-skipper-server/2.0.0.BUILD-SNAPSHOT/spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar ([https](https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-skipper-server/2.0.0.BUILD-SNAPSHOT/spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar) result 200). * [ ] http://start.spring.io/ with 1 occurrences migrated to: https://start.spring.io/ ([https](https://start.spring.io/) result 200). * [ ] http://www.mysql.com/ with 1 occurrences migrated to: https://www.mysql.com/ ([https](https://www.mysql.com/) result 200). * [ ] http://bit.ly/Dearborn-GA-task-applications-maven with 1 occurrences migrated to: https://bit.ly/Dearborn-GA-task-applications-maven ([https](https://bit.ly/Dearborn-GA-task-applications-maven) result 301). * [ ] http://bit.ly/Einstein-RC1-stream-applications-rabbit-maven with 1 occurrences migrated to: https://bit.ly/Einstein-RC1-stream-applications-rabbit-maven ([https](https://bit.ly/Einstein-RC1-stream-applications-rabbit-maven) result 301). * [ ] http://dbeaver.jkiss.org/ with 4 occurrences migrated to: https://dbeaver.jkiss.org/ ([https](https://dbeaver.jkiss.org/) result 301). * [ ] http://www.okta.com/k2lw4l5bPODCMIIDBRYZ with 1 occurrences migrated to: https://www.okta.com/k2lw4l5bPODCMIIDBRYZ ([https](https://www.okta.com/k2lw4l5bPODCMIIDBRYZ) result 301). * [ ] http://www.okta.com/k36wkjw6EAEJVZXFFDAU with 1 occurrences migrated to: https://www.okta.com/k36wkjw6EAEJVZXFFDAU ([https](https://www.okta.com/k36wkjw6EAEJVZXFFDAU) result 301). * [ ] http://bit.ly/ with 2 occurrences migrated to: https://bit.ly/ ([https](https://bit.ly/) result 302). * [ ] http://repo.spring.io/libs-milestone with 1 occurrences migrated to: https://repo.spring.io/libs-milestone ([https](https://repo.spring.io/libs-milestone) result 302). * [ ] http://repo.spring.io/libs-release with 1 occurrences migrated to: https://repo.spring.io/libs-release ([https](https://repo.spring.io/libs-release) result 302). These URLs were intentionally ignored. * http://docbook.org/ns/docbook with 4 occurrences * http://docbook.sourceforge.net/xmlns/l10n/1.0 with 2 occurrences * http://localhost:3000 with 2 occurrences * http://localhost:3001 with 1 occurrences * http://localhost:35357/v2.0/tokens with 1 occurrences * http://localhost:5000/v3/auth/tokens with 1 occurrences * http://localhost:7577/login with 1 occurrences * http://localhost:8080/dashboard with 1 occurrences * http://localhost:8080/uaa with 4 occurrences * http://localhost:8080/uaa/approvals with 1 occurrences * http://localhost:8080/uaa/authenticate with 1 occurrences * http://localhost:8080/uaa/oauth/authorize with 1 occurrences * http://localhost:8080/uaa/oauth/token with 3 occurrences * http://localhost:8081/openam/saml2/jsp/exportmetadata.jsp?entityid=http://localhost:8081/openam with 1 occurrences * http://localhost:8787 with 3 occurrences * http://localhost:8888 with 3 occurrences * http://localhost:9000 with 14 occurrences * http://localhost:9001 with 23 occurrences * http://localhost:9090 with 6 occurrences * http://localhost:9100 with 3 occurrences * http://localhost:9393 with 4 occurrences * http://localhost:9393/about with 1 occurrences * http://localhost:9393/apps with 1 occurrences * http://localhost:9393/audit-records with 1 occurrences * http://localhost:9393/completions with 1 occurrences * http://localhost:9393/dashboard with 2 occurrences * http://localhost:9393/jobs with 1 occurrences * http://localhost:9393/login with 1 occurrences * http://localhost:9393/runtime with 1 occurrences * http://localhost:9393/runtime/apps with 1 occurrences * http://localhost:9393/security with 1 occurrences * http://localhost:9393/streams with 1 occurrences * http://localhost:9393/tasks with 1 occurrences * http://localhost:9393/tasks/executions/current with 1 occurrences * http://localhost:9393/tools with 1 occurrences * http://localhost:9900 with 1 occurrences * http://www.w3.org/1999/XSL/Format with 2 occurrences * http://www.w3.org/1999/XSL/Transform with 6 occurrences * http://www.w3.org/1999/xlink with 1 occurrences --- .../DataflowTemplateApplication.java | 2 +- security-ldap-uaa-example/README.adoc | 4 ++-- security-ldap-uaa-example/dataflow.yml | 8 ++++---- security-ldap-uaa-example/skipper.yml | 8 ++++---- security-ldap-uaa-example/uaa.yml | 14 +++++++------- .../asciidoc/analytics/twitter-analytics/main.adoc | 8 ++++---- .../asciidoc/batch/file-ingest-sftp/local.adoc | 6 +++--- src/main/asciidoc/cloudfoundry-server.adoc | 1 - .../datascience/species-prediction/main.adoc | 4 ++-- src/main/asciidoc/functions/main.adoc | 4 ++-- src/main/asciidoc/geode-setup.adoc | 4 ++-- src/main/asciidoc/index.adoc | 6 +++--- src/main/asciidoc/local-server.adoc | 1 - src/main/asciidoc/micrometer/influx/main.adoc | 6 +++--- src/main/asciidoc/micrometer/prometheus/main.adoc | 6 +++--- src/main/asciidoc/overview.adoc | 10 +++++----- .../cassandra/http-to-cassandra/local.adoc | 6 +++--- .../cassandra/http-to-cassandra/main.adoc | 2 +- .../streaming/cassandra/http-to-cassandra/pcf.adoc | 4 ++-- .../celsius-converter-processor/main.adoc | 2 +- .../streaming/gemfire/gemfire-cq-log/main.adoc | 2 +- .../streaming/gemfire/gemfire-cq-log/pcf.adoc | 2 +- .../streaming/gemfire/gemfire-log/main.adoc | 2 +- .../streaming/gemfire/gemfire-log/pcf.adoc | 2 +- .../streaming/gemfire/http-gemfire/main.adoc | 2 +- .../streaming/gemfire/http-gemfire/pcf.adoc | 2 +- .../asciidoc/streaming/jdbc/http-mysql/local.adoc | 6 +++--- .../asciidoc/streaming/jdbc/http-mysql/main.adoc | 2 +- .../asciidoc/streaming/jdbc/http-mysql/pcf.adoc | 6 +++--- src/main/asciidoc/tasks/file-ingest/main.adoc | 2 +- src/main/asciidoc/tasks/simple-batch-job/main.adoc | 6 +++--- src/main/docbook/xsl/common.xsl | 2 +- src/main/docbook/xsl/epub.xsl | 2 +- src/main/docbook/xsl/html.xsl | 2 +- src/main/docbook/xsl/pdf.xsl | 2 +- 35 files changed, 73 insertions(+), 75 deletions(-) diff --git a/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java b/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java index fe40fe5..336c3d3 100644 --- a/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java +++ b/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java @@ -49,7 +49,7 @@ public class DataflowTemplateApplication implements ApplicationRunner { public void run(ApplicationArguments applicationArguments) throws Exception { final DataFlowTemplate dataFlowTemplate = getDataFlowTemplate("user", "secret99", "http://localhost:9393"); - final String appRegistrationUrl = "http://bit.ly/Einstein-RC1-stream-applications-rabbit-maven"; + final String appRegistrationUrl = "https://bit.ly/Einstein-RC1-stream-applications-rabbit-maven"; logger.info("\n\nImporting Applications from: {}.\n", appRegistrationUrl); final PagedResources appRegistrations = diff --git a/security-ldap-uaa-example/README.adoc b/security-ldap-uaa-example/README.adoc index 0a26880..9ca3072 100644 --- a/security-ldap-uaa-example/README.adoc +++ b/security-ldap-uaa-example/README.adoc @@ -139,7 +139,7 @@ This should yield output similar to the following: [source,bash] ---- -$ wget http://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-skipper-server/2.0.0.BUILD-SNAPSHOT/spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar +$ wget https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-skipper-server/2.0.0.BUILD-SNAPSHOT/spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar $ java -jar spring-cloud-skipper-server-2.0.0.BUILD-SNAPSHOT.jar \ --spring.config.additional-location=/path/to/ldap-uaa-example/skipper.yml ---- @@ -177,7 +177,7 @@ Now we need to import the Composed Task Runner and the Spring Cloud Task App Sta [source,bash] ---- -dataflow:> app import http://bit.ly/Dearborn-GA-task-applications-maven +dataflow:> app import https://bit.ly/Dearborn-GA-task-applications-maven ---- If you want to import _just_ the Composed Task Runner applications: diff --git a/security-ldap-uaa-example/dataflow.yml b/security-ldap-uaa-example/dataflow.yml index 43eb969..603f3c4 100644 --- a/security-ldap-uaa-example/dataflow.yml +++ b/security-ldap-uaa-example/dataflow.yml @@ -9,8 +9,8 @@ security: client: client-id: dataflow client-secret: dataflow - access-token-uri: http://dataflow.local:8080/uaa/oauth/token - user-authorization-uri: http://dataflow.local:8080/uaa/oauth/authorize + access-token-uri: https://dataflow.local:8080/uaa/oauth/token + user-authorization-uri: https://dataflow.local:8080/uaa/oauth/authorize resource: - user-info-uri: http://dataflow.local:8080/uaa/userinfo - token-info-uri: http://dataflow.local:8080/uaa/check_token \ No newline at end of file + user-info-uri: https://dataflow.local:8080/uaa/userinfo + token-info-uri: https://dataflow.local:8080/uaa/check_token \ No newline at end of file diff --git a/security-ldap-uaa-example/skipper.yml b/security-ldap-uaa-example/skipper.yml index cf696c5..67f42e5 100644 --- a/security-ldap-uaa-example/skipper.yml +++ b/security-ldap-uaa-example/skipper.yml @@ -9,8 +9,8 @@ security: client: client-id: skipper client-secret: skipper - access-token-uri: http://dataflow.local:8080/uaa/oauth/token - user-authorization-uri: http://dataflow.local:8080/uaa/oauth/authorize + access-token-uri: https://dataflow.local:8080/uaa/oauth/token + user-authorization-uri: https://dataflow.local:8080/uaa/oauth/authorize resource: - user-info-uri: http://dataflow.local:8080/uaa/userinfo - token-info-uri: http://dataflow.local:8080/uaa/check_token \ No newline at end of file + user-info-uri: https://dataflow.local:8080/uaa/userinfo + token-info-uri: https://dataflow.local:8080/uaa/check_token \ No newline at end of file diff --git a/security-ldap-uaa-example/uaa.yml b/security-ldap-uaa-example/uaa.yml index e4bd234..45dc56f 100755 --- a/security-ldap-uaa-example/uaa.yml +++ b/security-ldap-uaa-example/uaa.yml @@ -392,7 +392,7 @@ login: # providers: # my-oauth-provider: # type: oauth2.0 -# authUrl: http://my-auth.com +# authUrl: https://my-auth.com # tokenUrl: http://my-token.com # tokenKey: my-token-key # tokenKeyUrl: @@ -416,7 +416,7 @@ login: # - roles_example_group # my-oidc-provider: # type: oidc1.0 -# discoveryUrl: http://my-auth.com +# discoveryUrl: https://my-auth.com # tokenKey: my-token-key # issuer: token issuer (iss) # scopes: @@ -523,7 +523,7 @@ login: # providers: # okta-signed-or-encrypted: # idpMetadata: | -# MIICmTCCAgKgAwIBAgIGAUPATqmEMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYDVQQGEwJVUzETMBEG +# MIICmTCCAgKgAwIBAgIGAUPATqmEMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYDVQQGEwJVUzETMBEG # A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU # MBIGA1UECwwLU1NPUHJvdmlkZXIxEDAOBgNVBAMMB1Bpdm90YWwxHDAaBgkqhkiG9w0BCQEWDWlu # Zm9Ab2t0YS5jb20wHhcNMTQwMTIzMTgxMjM3WhcNNDQwMTIzMTgxMzM3WjCBjzELMAkGA1UEBhMC @@ -547,7 +547,7 @@ login: # metadataTrustCheck: true # showSamlLoginLink: true # linkText: 'Okta Preview 1' -# iconUrl: 'http://link.to/icon.jpg' +# iconUrl: 'https://link.to/icon.jpg' # addShadowUserOnLogin: true # externalGroupsWhitelist: # - admin @@ -560,7 +560,7 @@ login: # providerDescription: 'Human readable description of this provider' # okta-local-2: # idpMetadata: | -# MIICmTCCAgKgAwIBAgIGAUPATqmEMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYDVQQGEwJVUzETMBEG +# MIICmTCCAgKgAwIBAgIGAUPATqmEMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYDVQQGEwJVUzETMBEG # A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU # MBIGA1UECwwLU1NPUHJvdmlkZXIxEDAOBgNVBAMMB1Bpdm90YWwxHDAaBgkqhkiG9w0BCQEWDWlu # Zm9Ab2t0YS5jb20wHhcNMTQwMTIzMTgxMjM3WhcNNDQwMTIzMTgxMzM3WjCBjzELMAkGA1UEBhMC @@ -601,7 +601,7 @@ login: authorize: url: http://localhost:8080/uaa/oauth/authorize -# homeRedirect: http://example.com/ +# homeRedirect: https://example.com/ # branding: # consent: @@ -614,7 +614,7 @@ login: # footerLinks: # Terms: /exampleTerms # Privacy Agreement: privacy_example.html -# Licensing: http://example.com/ +# Licensing: https://example.com/ # banner: # logo: iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSUlEQVQ4EaVTO04DMRB9YdOTC+QcK46wFU3apclKuQMH4AYUkUxFmyY0PgLac3AB6ImM3kyePYkQDZZ27Zl58+aNP8A/x2J7ixI5Xr6wiHaMX8eIW/L3/tlStisUAZm8fx1acMxWTPFK0BBORhL5ukP2ZQ9UsjHXIqZA4LuVrwjsPjxxenRfAtAh47QenCiQgFL5fb8NpTyjlAf/5KOfa/llk/pG1WvV2T3T0We1wLh8jNAmaSUwyTMMRGC6dxDXIlExtUd7SZb0BKhXU3LIRrTfKKXNpsLU+R7VTWTFKJEpuzGbktNmuFiLjnEj4M52s4OnMVt/CedTYLWjx9Artc1269hG3MSohMps9LAjVCqrc9QWaJgSZCRWOp+GoX5J5u3lvan3nioIphIOnQr711BVXf0LAoGuieRnMt8A438SKEFEsuMDirEf/oirUgza/ucAAAAASUVORK5CYII= # text: Welcome to UAA! We will be undergoing system maintenance tonight. diff --git a/src/main/asciidoc/analytics/twitter-analytics/main.adoc b/src/main/asciidoc/analytics/twitter-analytics/main.adoc index 1f9936b..5cb1f9a 100644 --- a/src/main/asciidoc/analytics/twitter-analytics/main.adoc +++ b/src/main/asciidoc/analytics/twitter-analytics/main.adoc @@ -3,7 +3,7 @@ :docs_dir: ../.. === Twitter Analytics -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from _TwitterStream_, compute analytics over data-in-transit using https://github.com/spring-cloud-stream-app-starters/analytics[Analytics-Counter]. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from _TwitterStream_, compute analytics over data-in-transit using https://github.com/spring-cloud-stream-app-starters/analytics[Analytics-Counter]. Use Prometheus for storing and data aggregation analysis and Grafana for visualizing the computed data. We will take you through the steps to configure Spring Cloud Data Flow's `Local` server. @@ -21,9 +21,9 @@ Make sure to add the following properties when starting the Data Flow server: --spring.cloud.dataflow.applicationProperties.stream.management.endpoints.web.exposure.include=prometheus,info,health --spring.cloud.dataflow.grafana-info.url=http://localhost:3000 ``` -* Running instance of link:http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[Prometheus, Service Discovery and Grafana]. -Follow the http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[instructions] to start those services in Docker containers. -* Running instance of link:http://kafka.apache.org/downloads.html[Kafka] +* Running instance of link:https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[Prometheus, Service Discovery and Grafana]. +Follow the https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[instructions] to start those services in Docker containers. +* Running instance of link:https://kafka.apache.org/downloads.html[Kafka] * Twitter credentials from link:https://apps.twitter.com/[Twitter Developers] site ==== Building and Running the Demo diff --git a/src/main/asciidoc/batch/file-ingest-sftp/local.adoc b/src/main/asciidoc/batch/file-ingest-sftp/local.adoc index 25237ff..7ab5da6 100644 --- a/src/main/asciidoc/batch/file-ingest-sftp/local.adoc +++ b/src/main/asciidoc/batch/file-ingest-sftp/local.adoc @@ -7,7 +7,7 @@ include::{docs_dir}/local-server.adoc[] -* Running instance of link:http://kafka.apache.org/downloads.html[Kafka] +* Running instance of link:https://kafka.apache.org/downloads.html[Kafka] * Either a remote or local host accepting SFTP connections. * A database tool such as link:https://dbeaver.jkiss.org/download/[DBeaver] to inspect the database contents @@ -112,7 +112,7 @@ dataflow:>runtime apps ║ │ │ port = 23057 ║ ║inboundSftp.sftp-0 │ deployed │ stderr = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540821009913/inboundSftp.sftp/stderr_0.log ║ ║ │ │ stdout = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540821009913/inboundSftp.sftp/stdout_0.log ║ -║ │ │ url = http://192.168.64.1:23057 ║ +║ │ │ url = https://192.168.64.1:23057 ║ ║ │ │working.dir = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540821009913/inboundSftp.sftp ║ ╟───────────────────────────┼───────────┼────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╢ ║inboundSftp.task-launcher │ deployed │ 1 ║ @@ -122,7 +122,7 @@ dataflow:>runtime apps ║ │ │ port = 60081 ║ ║inboundSftp.task-launcher-0│ deployed │ stderr = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540820991695/inboundSftp.task-launcher/stderr_0.log║ ║ │ │ stdout = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540820991695/inboundSftp.task-launcher/stdout_0.log║ -║ │ │ url = http://192.168.64.1:60081 ║ +║ │ │ url = https://192.168.64.1:60081 ║ ║ │ │working.dir = /var/folders/hd/5yqz2v2d3sxd3n879f4sg4gr0000gn/T/spring-cloud-deployer-120915912946760306/inboundSftp-1540820991695/inboundSftp.task-launcher ║ ╚═══════════════════════════╧═══════════╧════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝ diff --git a/src/main/asciidoc/cloudfoundry-server.adoc b/src/main/asciidoc/cloudfoundry-server.adoc index 4e78206..49bc78c 100644 --- a/src/main/asciidoc/cloudfoundry-server.adoc +++ b/src/main/asciidoc/cloudfoundry-server.adoc @@ -1,2 +1 @@ - Follow the https://dataflow.spring.io/docs/installation/cloudfoundry/[installation] instructions to run Spring Cloud Data Flow on Cloud Foundry. diff --git a/src/main/asciidoc/datascience/species-prediction/main.adoc b/src/main/asciidoc/datascience/species-prediction/main.adoc index 1e96989..bbd2550 100644 --- a/src/main/asciidoc/datascience/species-prediction/main.adoc +++ b/src/main/asciidoc/datascience/species-prediction/main.adoc @@ -2,7 +2,7 @@ :docs_dir: ../.. === Species Prediction -In this demonstration, you will learn how to use https://en.wikipedia.org/wiki/Predictive_Model_Markup_Language[PMML] model in the context of streaming data pipeline orchestrated by http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow]. +In this demonstration, you will learn how to use https://en.wikipedia.org/wiki/Predictive_Model_Markup_Language[PMML] model in the context of streaming data pipeline orchestrated by https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow]. We will present the steps to prep, configure and rub Spring Cloud Data Flow's `Local` server, a Spring Boot application. @@ -12,7 +12,7 @@ We will present the steps to prep, configure and rub Spring Cloud Data Flow's `L include::{docs_dir}/shell.adoc[] * A running local Data Flow Server include::{docs_dir}/local-server.adoc[] -* Running instance of link:http://kafka.apache.org/downloads.html[Kafka] +* Running instance of link:https://kafka.apache.org/downloads.html[Kafka] ==== Building and Running the Demo diff --git a/src/main/asciidoc/functions/main.adoc b/src/main/asciidoc/functions/main.adoc index 666e0c6..5f71fe4 100644 --- a/src/main/asciidoc/functions/main.adoc +++ b/src/main/asciidoc/functions/main.adoc @@ -4,7 +4,7 @@ This is a experiment to run Spring Cloud Function workload in Spring Cloud Data Flow. The current release of `function-runner` used in this sample is at 1.0 M1 release and it is not recommended to be used in production. -In this sample, you will learn how to use https://github.com/spring-cloud/spring-cloud-function[Spring Cloud Function] based streaming applications in Spring Cloud Data Flow. To learn more about Spring Cloud Function, check out the http://cloud.spring.io/spring-cloud-function/[project page]. +In this sample, you will learn how to use https://github.com/spring-cloud/spring-cloud-function[Spring Cloud Function] based streaming applications in Spring Cloud Data Flow. To learn more about Spring Cloud Function, check out the https://cloud.spring.io/spring-cloud-function/[project page]. ==== Prerequisites @@ -13,7 +13,7 @@ include::{docs_dir}/shell.adoc[] * A running local Data Flow Server include::{docs_dir}/local-server.adoc[] -IMPORTANT: This sample requires access to both Spring's snapshot and milestone repos. Please follow https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#howto[how-to-guides] on how to set `http://repo.spring.io/libs-release` and `http://repo.spring.io/libs-milestone` as remote repositories in SCDF. +IMPORTANT: This sample requires access to both Spring's snapshot and milestone repos. Please follow https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#howto[how-to-guides] on how to set `https://repo.spring.io/libs-release` and `https://repo.spring.io/libs-milestone` as remote repositories in SCDF. * A local build of link:https://github.com/spring-cloud/spring-cloud-function[Spring Cloud Function] * A running instance of https://www.rabbitmq.com/[Rabbit MQ] diff --git a/src/main/asciidoc/geode-setup.adoc b/src/main/asciidoc/geode-setup.adoc index 47651e2..00e9189 100644 --- a/src/main/asciidoc/geode-setup.adoc +++ b/src/main/asciidoc/geode-setup.adoc @@ -1,6 +1,6 @@ -If you do not have access an existing Geode installation, install http://geode.apache.org[Apache Geode] or -http://geode.apache.org/[Pivotal Gemfire] and start the `gfsh` CLI in a separate terminal. +If you do not have access an existing Geode installation, install https://geode.apache.org[Apache Geode] or +https://geode.apache.org/[Pivotal Gemfire] and start the `gfsh` CLI in a separate terminal. ``` _________________________ __ / _____/ ______/ ______/ /____/ / diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index 3fa3392..a4637be 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -9,11 +9,11 @@ Sabby Anandan; David Turanski; Glenn Renfro; Eric Bottard; Mark Pollack; Chris S :hide-uri-scheme: :docinfo: shared -:spring-cloud-stream-docs: http://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/index.html +:spring-cloud-stream-docs: https://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/index.html :github-code: https://github.com/spring-cloud/spring-cloud-dataflow-samples :scdf-release-train-name: Einstein.GA -:app-import-kafka-maven: http://bit.ly/{scdf-release-train-name}-stream-applications-kafka-10-maven -:app-import-rabbit-maven: http://bit.ly/{scdf-release-train-name}-stream-applications-rabbit-maven +:app-import-kafka-maven: https://bit.ly/{scdf-release-train-name}-stream-applications-kafka-10-maven +:app-import-rabbit-maven: https://bit.ly/{scdf-release-train-name}-stream-applications-rabbit-maven ifdef::backend-html5[] diff --git a/src/main/asciidoc/local-server.adoc b/src/main/asciidoc/local-server.adoc index 0f8feb7..021dff8 100644 --- a/src/main/asciidoc/local-server.adoc +++ b/src/main/asciidoc/local-server.adoc @@ -1,2 +1 @@ - Follow the https://dataflow.spring.io/docs/installation/local/[installation] instructions to run Spring Cloud Data Flow on a local host. diff --git a/src/main/asciidoc/micrometer/influx/main.adoc b/src/main/asciidoc/micrometer/influx/main.adoc index b9e2f60..98a9cc6 100644 --- a/src/main/asciidoc/micrometer/influx/main.adoc +++ b/src/main/asciidoc/micrometer/influx/main.adoc @@ -4,11 +4,11 @@ === SCDF metrics with InfluxDB and Grafana -Demonstration, how to monitor your http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] (SCDF) streams using https://docs.influxdata.com/influxdb/v1.5/[InfluxDB] and https://grafana.com/grafana[Grafana]. +Demonstration, how to monitor your https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] (SCDF) streams using https://docs.influxdata.com/influxdb/v1.5/[InfluxDB] and https://grafana.com/grafana[Grafana]. -By default the http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#getting-started-local-deploying-spring-cloud-dataflow-docker[Data Flow 2.0+ docker-compose configures] Stream monitoring with InfluxDB and pre-built dashboards for Grafana. +By default the https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#getting-started-local-deploying-spring-cloud-dataflow-docker[Data Flow 2.0+ docker-compose configures] Stream monitoring with InfluxDB and pre-built dashboards for Grafana. -For further instructions about Data Flow monitoring, follow the http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local[Streams Monitoring InfluxDB] section. +For further instructions about Data Flow monitoring, follow the https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local[Streams Monitoring InfluxDB] section. image::grafana-influxdb-scdf-streams-dashboard.png[Grafana InfluxDB Dashboard, scaledwidth="50%"] diff --git a/src/main/asciidoc/micrometer/prometheus/main.adoc b/src/main/asciidoc/micrometer/prometheus/main.adoc index bafc96d..9d2aceb 100644 --- a/src/main/asciidoc/micrometer/prometheus/main.adoc +++ b/src/main/asciidoc/micrometer/prometheus/main.adoc @@ -4,13 +4,13 @@ === SCDF metrics with Prometheus and Grafana -In this demonstration, you will learn how to monitor your http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] Streams using http://prometheus.io[Prometheus] and https://grafana.com/grafana[Grafana]. +In this demonstration, you will learn how to monitor your https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] Streams using https://prometheus.io[Prometheus] and https://grafana.com/grafana[Grafana]. Starting with 2.0, Data Flow provides built-in support for monitoring with Prometheus. Following the reference manual instructions for how to get started with Prometheus: -* http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[Prometheus with SCDF-Local] -* http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-kubernetes-prometheus[Prometheus with SCDF-Kubernetes] +* https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-local-prometheus[Prometheus with SCDF-Local] +* https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring-kubernetes-prometheus[Prometheus with SCDF-Kubernetes] Following diagram (Fig.4) illustrates the metrics collection flows for monitoring with prometheus on a Local SCDF platform: diff --git a/src/main/asciidoc/overview.adoc b/src/main/asciidoc/overview.adoc index 1cc7fb4..7a312c5 100644 --- a/src/main/asciidoc/overview.adoc +++ b/src/main/asciidoc/overview.adoc @@ -30,19 +30,19 @@ include::datascience/species-prediction/main.adoc[] include::functions/main.adoc[] == Monitoring (Micrometer) -Demonstrate how to monitor your http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] (SCDF) streams using https://docs.influxdata.com/influxdb/v1.5/[InfluxDB], http://prometheus.io[Prometheus] and https://grafana.com/grafana[Grafana]. +Demonstrate how to monitor your https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] (SCDF) streams using https://docs.influxdata.com/influxdb/v1.5/[InfluxDB], https://prometheus.io[Prometheus] and https://grafana.com/grafana[Grafana]. -The http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring[Data Flow 2.x metrics architecture] is designed around the https://micrometer.io/[Micrometer library] and provides support for two of the most popular monitoring systems, Prometheus and InfluxDB. +The https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring[Data Flow 2.x metrics architecture] is designed around the https://micrometer.io/[Micrometer library] and provides support for two of the most popular monitoring systems, Prometheus and InfluxDB. Also to help you get started monitoring Streams, Data Flow provides https://grafana.com/[Grafana Dashboards] you can install and customize for your needs. Support for monitoring Tasks is on the roadmap. The general architecture of how applications are monitored is shown below. -image:http://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc/images/micrometer-arch.png[SCDF Stream Monitoring, scaledwidth="100%"] +image:https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc/images/micrometer-arch.png[SCDF Stream Monitoring, scaledwidth="100%"] -You can find more information in the http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring[SCDF Stream Monitoring] reference manual. +You can find more information in the https://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#streams-monitoring[SCDF Stream Monitoring] reference manual. -* http://prometheus.io[Prometheus] - pull based time series database used for monitoring of highly dynamic service-oriented architectures. +* https://prometheus.io[Prometheus] - pull based time series database used for monitoring of highly dynamic service-oriented architectures. In a world of microservices, its support for multi-dimensional data collection and querying is a particular strength. * https://github.com/influxdata/influxdb[InfluxDB] is a popular open-source push based time series database. It supports downsampling, automatically expiring and deleting unwanted data, as well as backup and restore. Analysis of data is done via a https://docs.influxdata.com/influxdb/v1.5/query_language/[SQL-like query] language. diff --git a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc index 7aa88f8..6c498b9 100644 --- a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc +++ b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc @@ -6,10 +6,10 @@ * Spring Cloud Data Flow installed locally include::{docs_dir}/local-server.adoc[] -* Running instance of link:http://kafka.apache.org/downloads.html[Kafka] -* Running instance of link:http://cassandra.apache.org/[Apache Cassandra] +* Running instance of link:https://kafka.apache.org/downloads.html[Kafka] +* Running instance of link:https://cassandra.apache.org/[Apache Cassandra] -* A database utility tool such as link:http://dbeaver.jkiss.org/[DBeaver] to connect to the Cassandra instance. You might have to provide `host`, `port`, `username` and `password` depending on the Cassandra configuration you are using. +* A database utility tool such as link:https://dbeaver.jkiss.org/[DBeaver] to connect to the Cassandra instance. You might have to provide `host`, `port`, `username` and `password` depending on the Cassandra configuration you are using. * Create a keyspace and a `book` table in Cassandra using: ``` diff --git a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/main.adoc b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/main.adoc index b446885..2bd4425 100644 --- a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/main.adoc +++ b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/main.adoc @@ -3,7 +3,7 @@ :docs_dir: ../../.. === HTTP to Cassandra Demo -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an _HTTP_ endpoint and write the payload to a _Cassandra_ database. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an _HTTP_ endpoint and write the payload to a _Cassandra_ database. We will take you through the steps to configure and Spring Cloud Data Flow server in either a https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#getting-started/[local] or https://docs.spring.io/spring-cloud-dataflow-server-cloudfoundry/docs/current/reference/htmlsingle/#getting-started[Cloud Foundry] environment. diff --git a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/pcf.adoc b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/pcf.adoc index bafe64d..df1c362 100644 --- a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/pcf.adoc +++ b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/pcf.adoc @@ -7,7 +7,7 @@ * A `rabbit` service instance * A Running instance of `cassandra` in Cloud Foundry or from another Cloud provider -* A database utility tool such as link:http://dbeaver.jkiss.org/[DBeaver] to connect to the Cassandra instance. You might have to provide `host`, `port`, `username` and `password` depending on the Cassandra configuration you are using. +* A database utility tool such as link:https://dbeaver.jkiss.org/[DBeaver] to connect to the Cassandra instance. You might have to provide `host`, `port`, `username` and `password` depending on the Cassandra configuration you are using. * Create a `book` table in your Cassandra keyspace using: + ``` @@ -72,7 +72,7 @@ dataflow-server started 1/1 1G 1G datafl + ``` http post --contentType 'application/json' --data '{"isbn": "1599869772", "title": "The Art of War", "author": "Sun Tzu"}' --target http:// -> POST (application/json;charset=UTF-8) http://cassandrastream-http.app.io {"isbn": "1599869772", "title": "The Art of War", "author": "Sun Tzu"} +> POST (application/json;charset=UTF-8) https://cassandrastream-http.app.io {"isbn": "1599869772", "title": "The Art of War", "author": "Sun Tzu"} > 202 ACCEPTED ``` + diff --git a/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc b/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc index c566bcd..49a9fcd 100644 --- a/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc +++ b/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc @@ -20,7 +20,7 @@ We will be running the demo locally, but all the steps will work in a Cloud Foun . Create a new spring cloud stream project + -* Create a http://start.spring.io/[Spring initializer] project +* Create a https://start.spring.io/[Spring initializer] project * Set the group to `demo.celsius.converter` and the artifact name as `celsius-converter-processor` diff --git a/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/main.adoc b/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/main.adoc index 0591be0..aa0847e 100644 --- a/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/main.adoc +++ b/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/main.adoc @@ -4,7 +4,7 @@ === Gemfire CQ to Log Demo -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from a `gemfire-cq` (Continuous Query) endpoint and write to a log using the `log` sink. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from a `gemfire-cq` (Continuous Query) endpoint and write to a log using the `log` sink. The `gemfire-cq` source creates a Continuous Query to monitor events for a region that match the query's result set and publish a message whenever such an event is emitted. In this example, we simulate monitoring orders to trigger a process whenever the quantity ordered is above a defined limit. diff --git a/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/pcf.adoc b/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/pcf.adoc index 4ae513e..cd66fda 100644 --- a/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/pcf.adoc +++ b/src/main/asciidoc/streaming/gemfire/gemfire-cq-log/pcf.adoc @@ -38,7 +38,7 @@ Getting key my-service-key for service instance cloudcache as ... ], "urls": { "gfsh": "http://...", - "pulse": "http://.../pulse" + "pulse": "https://.../pulse" }, "users": [ { diff --git a/src/main/asciidoc/streaming/gemfire/gemfire-log/main.adoc b/src/main/asciidoc/streaming/gemfire/gemfire-log/main.adoc index 530c14b..986435e 100644 --- a/src/main/asciidoc/streaming/gemfire/gemfire-log/main.adoc +++ b/src/main/asciidoc/streaming/gemfire/gemfire-log/main.adoc @@ -4,7 +4,7 @@ === Gemfire to Log Demo -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from a `gemfire` endpoint and write to a log using the `log` sink. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from a `gemfire` endpoint and write to a log using the `log` sink. The `gemfire` source creates a https://geode.apache.org/releases/latest/javadoc/org/apache/geode/cache/CacheListener.html[CacheListener] to monitor events for a region and publish a message whenever an entry is changed. We will take you through the steps to configure and run Spring Cloud Data Flow server in either a https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#getting-started/[local] or https://docs.spring.io/spring-cloud-dataflow-server-cloudfoundry/docs/current/reference/htmlsingle/#getting-started[Cloud Foundry] environment. diff --git a/src/main/asciidoc/streaming/gemfire/gemfire-log/pcf.adoc b/src/main/asciidoc/streaming/gemfire/gemfire-log/pcf.adoc index 2a9baf7..a2d4f8c 100644 --- a/src/main/asciidoc/streaming/gemfire/gemfire-log/pcf.adoc +++ b/src/main/asciidoc/streaming/gemfire/gemfire-log/pcf.adoc @@ -37,7 +37,7 @@ Getting key my-service-key for service instance cloudcache as ... ], "urls": { "gfsh": "http://...", - "pulse": "http://.../pulse" + "pulse": "https://.../pulse" }, "users": [ { diff --git a/src/main/asciidoc/streaming/gemfire/http-gemfire/main.adoc b/src/main/asciidoc/streaming/gemfire/http-gemfire/main.adoc index e18dc09..45c0e38 100644 --- a/src/main/asciidoc/streaming/gemfire/http-gemfire/main.adoc +++ b/src/main/asciidoc/streaming/gemfire/http-gemfire/main.adoc @@ -4,7 +4,7 @@ === HTTP to Gemfire Demo -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an `http` endpoint and write to Gemfire using the `gemfire` sink. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an `http` endpoint and write to Gemfire using the `gemfire` sink. We will take you through the steps to configure and run Spring Cloud Data Flow server in either a https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#getting-started/[local] or https://docs.spring.io/spring-cloud-dataflow-server-cloudfoundry/docs/current/reference/htmlsingle/#getting-started[Cloud Foundry] environment. diff --git a/src/main/asciidoc/streaming/gemfire/http-gemfire/pcf.adoc b/src/main/asciidoc/streaming/gemfire/http-gemfire/pcf.adoc index e53a9e1..255d6b9 100644 --- a/src/main/asciidoc/streaming/gemfire/http-gemfire/pcf.adoc +++ b/src/main/asciidoc/streaming/gemfire/http-gemfire/pcf.adoc @@ -37,7 +37,7 @@ Getting key my-service-key for service instance cloudcache as ... ], "urls": { "gfsh": "http://...", - "pulse": "http://.../pulse" + "pulse": "https://.../pulse" }, "users": [ { diff --git a/src/main/asciidoc/streaming/jdbc/http-mysql/local.adoc b/src/main/asciidoc/streaming/jdbc/http-mysql/local.adoc index 03b0c10..7d7a118 100644 --- a/src/main/asciidoc/streaming/jdbc/http-mysql/local.adoc +++ b/src/main/asciidoc/streaming/jdbc/http-mysql/local.adoc @@ -5,9 +5,9 @@ * Spring Cloud Data Flow installed locally include::{docs_dir}/local-server.adoc[] -* Running instance of link:http://kafka.apache.org/downloads.html[Kafka] -* Running instance of link:http://www.mysql.com/[MySQL] -* A database utility tool such as link:http://dbeaver.jkiss.org/[DBeaver] or link:https://www.dbvis.com/[DbVisualizer] +* Running instance of link:https://kafka.apache.org/downloads.html[Kafka] +* Running instance of link:https://www.mysql.com/[MySQL] +* A database utility tool such as link:https://dbeaver.jkiss.org/[DBeaver] or link:https://www.dbvis.com/[DbVisualizer] * Create the `test` database with a `names` table (in MySQL) using: + ``` diff --git a/src/main/asciidoc/streaming/jdbc/http-mysql/main.adoc b/src/main/asciidoc/streaming/jdbc/http-mysql/main.adoc index bd8ce3b..3b7c3ea 100644 --- a/src/main/asciidoc/streaming/jdbc/http-mysql/main.adoc +++ b/src/main/asciidoc/streaming/jdbc/http-mysql/main.adoc @@ -3,7 +3,7 @@ === HTTP to MySQL Demo -In this demonstration, you will learn how to build a data pipeline using http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an `http` endpoint and write to MySQL database using `jdbc` sink. +In this demonstration, you will learn how to build a data pipeline using https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] to consume data from an `http` endpoint and write to MySQL database using `jdbc` sink. We will take you through the steps to configure and Spring Cloud Data Flow server in either a https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#getting-started/[local] or https://docs.spring.io/spring-cloud-dataflow-server-cloudfoundry/docs/current/reference/htmlsingle/#getting-started[Cloud Foundry] environment. diff --git a/src/main/asciidoc/streaming/jdbc/http-mysql/pcf.adoc b/src/main/asciidoc/streaming/jdbc/http-mysql/pcf.adoc index b0534c2..c986608 100644 --- a/src/main/asciidoc/streaming/jdbc/http-mysql/pcf.adoc +++ b/src/main/asciidoc/streaming/jdbc/http-mysql/pcf.adoc @@ -7,7 +7,7 @@ * Running instance of `rabbit` in Cloud Foundry * Running instance of `mysql` in Cloud Foundry -* A database utility tool such as link:http://dbeaver.jkiss.org/[DBeaver] or link:https://www.dbvis.com/[DbVisualizer] +* A database utility tool such as link:https://dbeaver.jkiss.org/[DBeaver] or link:https://www.dbvis.com/[DbVisualizer] * Create the `names` table (in MySQL) using: + ``` @@ -71,8 +71,8 @@ dataflow-server started 1/1 1G 1G datafl . Lookup the `url` for `mysqlstream-http` application from the list above. Post sample data pointing to the `http` endpoint: `` + ``` -http post --contentType 'application/json' --data "{\"name\": \"Bar"} --target http://mysqlstream-http.app.io " -> POST (application/json;charset=UTF-8) http://mysqlstream-http.app.io {"name": "Bar"} +http post --contentType 'application/json' --data "{\"name\": \"Bar"} --target https://mysqlstream-http.app.io " +> POST (application/json;charset=UTF-8) https://mysqlstream-http.app.io {"name": "Bar"} > 202 ACCEPTED ``` + diff --git a/src/main/asciidoc/tasks/file-ingest/main.adoc b/src/main/asciidoc/tasks/file-ingest/main.adoc index e6bd00b..142a689 100644 --- a/src/main/asciidoc/tasks/file-ingest/main.adoc +++ b/src/main/asciidoc/tasks/file-ingest/main.adoc @@ -1,7 +1,7 @@ === Batch File Ingest -In this demonstration, you will learn how to create a data processing application using http://projects.spring.io/spring-batch/[Spring Batch] which will then be run within http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow]. +In this demonstration, you will learn how to create a data processing application using https://projects.spring.io/spring-batch/[Spring Batch] which will then be run within https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow]. ==== Prerequisites diff --git a/src/main/asciidoc/tasks/simple-batch-job/main.adoc b/src/main/asciidoc/tasks/simple-batch-job/main.adoc index 4f5ef9c..1319243 100644 --- a/src/main/asciidoc/tasks/simple-batch-job/main.adoc +++ b/src/main/asciidoc/tasks/simple-batch-job/main.adoc @@ -2,7 +2,7 @@ :docs_dir: ../.. === Batch Job on Cloud Foundry -In this demonstration, you will learn how to orchestrate short-lived data processing application (_eg: Spring Batch Jobs_) using http://cloud.spring.io/spring-cloud-task/[Spring Cloud Task] and http://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] on Cloud Foundry. +In this demonstration, you will learn how to orchestrate short-lived data processing application (_eg: Spring Batch Jobs_) using https://cloud.spring.io/spring-cloud-task/[Spring Cloud Task] and https://cloud.spring.io/spring-cloud-dataflow/[Spring Cloud Data Flow] on Cloud Foundry. ==== Prerequisites @@ -35,7 +35,7 @@ NOTE: For this sample, all you need is the `mysql` service and in PCFDev, the `m NOTE: All the apps deployed to PCFDev start with low memory by default. It is recommended to change it to at least 768MB for `dataflow-server`. Ditto for every app spawned *by* Spring Cloud Data Flow. Change the memory by: `cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_MEMORY 512`. Likewise, we would have to skip SSL validation by: `cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION true`. -. Tasks in Spring Cloud Data Flow require an RDBMS to host "task repository" (see http://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#spring-cloud-dataflow-task-repository[here] for more details), so let's instruct the Spring Cloud Data Flow server to bind the `mysql` service to each deployed task: +. Tasks in Spring Cloud Data Flow require an RDBMS to host "task repository" (see https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#spring-cloud-dataflow-task-repository[here] for more details), so let's instruct the Spring Cloud Data Flow server to bind the `mysql` service to each deployed task: + @@ -70,7 +70,7 @@ No staging env variables have been set ``` + -. Notice that `dataflow-server` application is started and ready for interaction via `http://dataflow-server.local.pcfdev.io` endpoint +. Notice that `dataflow-server` application is started and ready for interaction via `https://dataflow-server.local.pcfdev.io` endpoint + . Build and register the batch-job https://github.com/spring-cloud/spring-cloud-task/tree/master/spring-cloud-task-samples/batch-job[example] from Spring Cloud Task samples. For convenience, the final https://github.com/spring-cloud/spring-cloud-dataflow-samples/raw/master/src/main/asciidoc/tasks/simple-batch-job/batch-job-1.3.0.BUILD-SNAPSHOT.jar[uber-jar artifact] is provided with this sample. diff --git a/src/main/docbook/xsl/common.xsl b/src/main/docbook/xsl/common.xsl index 157bf9d..45143c7 100644 --- a/src/main/docbook/xsl/common.xsl +++ b/src/main/docbook/xsl/common.xsl @@ -20,7 +20,7 @@ --> diff --git a/src/main/docbook/xsl/epub.xsl b/src/main/docbook/xsl/epub.xsl index 031406c..a7d5089 100644 --- a/src/main/docbook/xsl/epub.xsl +++ b/src/main/docbook/xsl/epub.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/src/main/docbook/xsl/html.xsl b/src/main/docbook/xsl/html.xsl index fd96f9a..6aedb3b 100644 --- a/src/main/docbook/xsl/html.xsl +++ b/src/main/docbook/xsl/html.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/src/main/docbook/xsl/pdf.xsl b/src/main/docbook/xsl/pdf.xsl index 3074094..d106c3f 100644 --- a/src/main/docbook/xsl/pdf.xsl +++ b/src/main/docbook/xsl/pdf.xsl @@ -22,7 +22,7 @@ under the License.