From 3eb993f41f937d883265d2aee6b0a3bf3f80cf1c Mon Sep 17 00:00:00 2001 From: shavidissa Date: Tue, 30 Jul 2024 10:49:08 -0700 Subject: [PATCH 1/4] minor change to start the build --- pages/doc/proxies_container.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/doc/proxies_container.md b/pages/doc/proxies_container.md index a8d327811..0d0ec4beb 100644 --- a/pages/doc/proxies_container.md +++ b/pages/doc/proxies_container.md @@ -192,4 +192,4 @@ docker run -it -e WAVEFRONT_URL=xxxxxxx -e WAVEFRONT_TOKEN=xxxxxx -p 2878:2878 - You must specify: * WAVEFRONT_URL: The URL of your Operations for Applications service (e.g., https://example.wavefront.com) * WAVEFRONT_TOKEN is the [Operations for Applications API token](api_tokens.html). The user account or service account associated with the API token must be assigned with the **Proxies** permission. -* The port that the proxy is using; 2878 by default. \ No newline at end of file +* The port that the proxy is using; 2878 by default. From 7d24a20f551c5a424ad086a5ceadbe10ff9540f0 Mon Sep 17 00:00:00 2001 From: shavidissa Date: Tue, 30 Jul 2024 10:54:28 -0700 Subject: [PATCH 2/4] revert change --- pages/doc/proxies_container.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/doc/proxies_container.md b/pages/doc/proxies_container.md index 0d0ec4beb..a8d327811 100644 --- a/pages/doc/proxies_container.md +++ b/pages/doc/proxies_container.md @@ -192,4 +192,4 @@ docker run -it -e WAVEFRONT_URL=xxxxxxx -e WAVEFRONT_TOKEN=xxxxxx -p 2878:2878 - You must specify: * WAVEFRONT_URL: The URL of your Operations for Applications service (e.g., https://example.wavefront.com) * WAVEFRONT_TOKEN is the [Operations for Applications API token](api_tokens.html). The user account or service account associated with the API token must be assigned with the **Proxies** permission. -* The port that the proxy is using; 2878 by default. +* The port that the proxy is using; 2878 by default. \ No newline at end of file From d4e237fc4afe1cbc19eb3a9da32e4f1129312e57 Mon Sep 17 00:00:00 2001 From: shavidissa Date: Thu, 1 Aug 2024 10:43:33 -0700 Subject: [PATCH 3/4] Update docs to remove spring Boot freemium --- pages/doc/documentation_getting_started.md | 2 +- pages/doc/wavefront_spring_boot.md | 48 ++---- pages/doc/wavefront_spring_boot3.md | 155 ++----------------- pages/doc/wavefront_spring_boot3_tutorial.md | 34 ++-- pages/doc/wavefront_spring_boot_faq.md | 56 +------ pages/doc/wavefront_spring_boot_tutorial.md | 29 ++-- 6 files changed, 64 insertions(+), 260 deletions(-) diff --git a/pages/doc/documentation_getting_started.md b/pages/doc/documentation_getting_started.md index a7f6d9d46..a8e2107f3 100644 --- a/pages/doc/documentation_getting_started.md +++ b/pages/doc/documentation_getting_started.md @@ -90,7 +90,7 @@ Our documentation includes reference documentation for API, query language, and
  • Charts FAQ explains how to set color mapping, how to define drilldown links, and more.
  • Kubernetes FAQ addresses common questions, such as integrating with third-party applications.
  • Tracing FAQ helps with common tasks like filtering RED metrics with custom span tags.
    • -
  • Wavefront and Spring Boot FAQ explains differences between Freemium and trial clusters, how to visualize metrics and traces, and more.
    • +
  • Wavefront and Spring Boot FAQ explains how to send data to our service from a Spring Boot application and how to visualize metrics and traces, and more.
screenshot of TOC of chart FAQ diff --git a/pages/doc/wavefront_spring_boot.md b/pages/doc/wavefront_spring_boot.md index c321026b0..fbbf8cfc2 100644 --- a/pages/doc/wavefront_spring_boot.md +++ b/pages/doc/wavefront_spring_boot.md @@ -21,12 +21,10 @@ If you use Wavefront for Spring Boot: ## Sending Data from Spring Boot Into Our Service -You can send data from your Spring Boot applications into our service using the Wavefront for Spring Boot Starter (all users) or the Wavefront Spring Boot integration (customers). +You can send data from your Spring Boot applications into our service using the Wavefront for Spring Boot Starter or the Wavefront Spring Boot integration. -* **Wavefront for Spring Boot Starter**
If you configure your application with the Wavefront for Spring Boot starter, you can send metrics, histograms, and traces/spans to our service. Once the data is in our service, you can view your data, find hotspots, and gather more data. - - All users can run the Spring Boot Starter with the default settings to view their data in the freemium instance. Certain limitations apply, for example, alerts are not available, but you don't have to sign up. - +* **Wavefront for Spring Boot Starter** +
If you configure your application with the Wavefront for Spring Boot starter, you can send metrics, histograms, and traces/spans to our service. Once the data is in our service, you can view your data, find hotspots, and gather more data. Customers can modify the default Wavefront Spring Boot Starter to send data to their cluster. * **Wavefront Spring Boot Integration**: Customers can access the Wavefront Spring Boot integration directly from their clusters. ## Dashboards @@ -58,8 +56,8 @@ This is the default dashboard you see when you run the Spring Boot initializer. Getting started is easy. Here are some things to know before you start: * **Ingestion Method**: Wavefront for Spring Boot sends data to our service via [direct ingestion](direct_ingestion.html) by default. You can [configure your application to send data via the Wavefront proxy](#proxy). -* **Target**: Wavefront for Spring Boot sends data to the freemium instance by default. You can [configure your application to send data to your Operations for Applications instance](#step-2-optional-specify-your-operations-for-applications-instance). -* **Account**: By default, the starter sends you to the Freemium instance, auto-negotiates an account, and saves the API token in the `~/.wavefront_freemium` file in your home directory. If you customize the starter to go to your Operations for Applications instance (see Step 2 below) you need to include an API token for that instance. +* **Target**: You can [configure your application to send data to your Operations for Applications instance](#step-2-optional-specify-your-operations-for-applications-instance). +* **Account**: To send data to your Operations for Applications instance (see Step 2 below) you need to include an API token for that instance. ### Prerequisites for Wavefront Spring Boot Starter @@ -308,9 +306,9 @@ dependencies { -### Step 2 (Optional): Specify Your Operations for Applications Instance +### Step 2: Specify Your Operations for Applications Instance -By default, the Wavefront Spring Boot Starter creates an account for you and sends data to the Freemium instance. If you already have an Operations for Applications account, you can send data there instead by specifying the `uri` and `api-token` properties, as follows: +To send data to your Operations for Applications account, specify the `uri` and `api-token` properties as follows: ``` management.metrics.export.wavefront.api-token=$API_Token @@ -326,7 +324,6 @@ management.metrics.export.wavefront.uri=$wavefront_instance To view your data, you first run your project from the command line, and then click the link that directs you to our service. Follow these steps: 1. Run your project. - {% include note.html content="If you're using the Freemium instance, an account is auto-negotiated or restored from `~/.wavefront_freemium` in your home directory each time the application starts. Otherwise, you're directed to the instance you specified. "%}
@@ -137,114 +131,6 @@ Initialize a new project using the Spring Initializer or add the required depend
-
-

Follow these steps if you don't have an Operations for Applications account and need to use the freemium account.

-
    -
  1. Add the Wavefront dependency. - -
    -
    -

    Open your application and add the following code to your pom.xml file.

    - 
    -<dependency>
-  <groupId>com.wavefront</groupId>
-  <artifactId>wavefront-spring-boot-starter</artifactId>
-  <scope>runtime</scope>
-</dependency>
-
    -
    - -
    -

    Open your application and add the following code to your build.gradle file.

    - 
    -dependencies {
-  ...
-  runtimeOnly 'com.wavefront:wavefront-spring-boot-starter'
-}
-
    -
    -
    -
    2. - -
  2. - Import the Wavefront for Spring Boot Bill of Materials (BOM) to your project. - {{site.data.alerts.tip}} -

    The Wavefront for Spring Boot dependency needs to be compatible with the Spring Boot release version. Therefore, replace $releaseVersion with the correct dependency version. See System Requirements to get the correct dependency version.

    - {{site.data.alerts.end}} - -
    -
    - 
    -
-<dependencyManagement>
-  <dependencies>
-  .....
-    <dependency>
-      <groupId>com.wavefront</groupId>
-      <artifactId>wavefront-spring-boot-bom</artifactId>
-      <version>$releaseVersion</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
-  .....
-  </dependencies>
-</dependencyManagement>
-
    -
    - -
    - 
    -dependencyManagement {
-  imports {
-    mavenBom "com.wavefront:wavefront-spring-boot-bom:$releaseVersion"
-  }
-}
-
    -
    -
    -
    3. - -
  3. - If you want to send trace data to our service using Micrometer Tracing, add the following dependencies. - -
    -
    - 
    -<dependency>
-  <groupId>io.micrometer</groupId>
-  <artifactId>micrometer-tracing-bridge-brave</artifactId>
-</dependency>
-<dependency>
-  <groupId>io.micrometer</groupId>
-  <artifactId>micrometer-tracing-reporter-wavefront</artifactId>
-  <scope>runtime</scope>
-</dependency>
-
    -
    - -
    - 
    -dependencies {
-  ...
-  implementation 'io.micrometer:micrometer-tracing-bridge-brave'
-  runtimeOnly 'io.micrometer:micrometer-tracing-reporter-wavefront'
-}
-
    -
    -
    -
    4. -
-
-

Follow these steps if you already have an Operations for Applications account.

    @@ -322,9 +208,9 @@ dependencies {
-### Step 2 (Optional): Specify Your Operations for Applications Instance +### Step 2: Specify Your Operations for Applications Instance -By default, the Wavefront Spring Boot Starter creates an account for you and sends data to the Freemium instance. If you already have an Operations for Applications account, you can send data there instead by specifying the `uri` and `api-token` properties as follows: +To send data to your Operations for Applications account, specify the `uri` and `api-token` properties as follows: ``` management.wavefront.api-token=$API_Token @@ -339,7 +225,6 @@ management.wavefront.uri=$wavefront_instance To view your data, you first run your project from the command line, and then click the link that directs you to our service. Follow these steps: 1. Run your project. - {% include note.html content="If you're using the Freemium instance, an account is auto-negotiated or restored from `~/.wavefront_freemium` in your home directory each time the application starts. Otherwise, you're directed to the instance you specified. "%}