Skip to content

Commit b47adb0

Browse files
author
Jann-Skotdal
committed
2 parents 54568cf + b4b4d8c commit b47adb0

File tree

50 files changed

+632
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+632
-315
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7949,6 +7949,11 @@
79497949
"redirect_url": "/azure/container-instances/container-instances-jenkins",
79507950
"redirect_document_id": false
79517951
},
7952+
{
7953+
"source_path": "articles/jenkins/java-deploy-webapp-tutorial.md",
7954+
"redirect_url": "/azure/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service",
7955+
"redirect_document_id": false
7956+
},
79527957
{
79537958
"source_path": "articles/container-service/dcos-swarm/container-service-deployment.md",
79547959
"redirect_url": "/azure/container-service/dcos-swarm",

‎articles/aks/jenkins-continuous-deployment.md

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,61 @@
11
---
2-
title: Jenkins continuous deployment with Azure Kubernetes Service (AKS)
3-
description: Learn how to automate a continuous deployment process with Jenkins to deploy and upgrade a containerized app in Azure Kubernetes Service (AKS)
2+
title: Tutorial - Deploy from GitHub to Azure Kubernetes Service (AKS) with Jenkins
3+
description: Set up Jenkins for continuous integration (CI) from GitHub and continuous deployment (CD) to Azure Kubernetes Service (AKS)
44
services: container-service
5-
author: iainfoulds
6-
75
ms.service: container-service
6+
author: iainfoulds
7+
ms.author: iainfou
88
ms.topic: article
99
ms.date: 09/27/2018
10-
ms.author: iainfou
1110
---
1211

13-
# Create a continuous deployment pipeline with Jenkins and Azure Kubernetes Service (AKS)
12+
# Tutorial: Deploy from GitHub to Azure Kubernetes Service (AKS) with Jenkins continuous integration and deployment
1413

15-
To quickly deploy updates to applications in Azure Kubernetes Service (AKS), you often use a continuous integration and continuous delivery (CI/CD) platform. In a CI/CD platform, a code commit can trigger a new container build that is then used to deploy an updated application instance. In this article, you use Jenkins as the CI/CD platform to build and push container images to Azure Container Registry (ACR) and then run those applications in AKS. You learn how to:
14+
This tutorial deploys a sample app from GitHub to an
15+
[Azure Kubernetes Service (AKS)](/azure/aks/intro-kubernetes)
16+
cluster by setting up continuous integration (CI) and
17+
continuous deployment (CD) in Jenkins. That way, when you
18+
update your app by pushing commits to GitHub, Jenkins
19+
automatically runs a new container build, pushes container
20+
images to Azure Container Registry (ACR), and then runs your app in AKS.
21+
22+
In this tutorial, you'll complete these tasks:
1623

1724
> [!div class="checklist"]
18-
> * Deploy a sample Azure vote application to an AKS cluster
19-
> * Create a basic Jenkins instance
20-
> * Configure credentials for Jenkins to interact with ACR
21-
> * Create a Jenkins build job and GitHub webhook for automated builds
22-
> * Test the CI/CD pipeline to update an application in AKS based on GitHub code commits
25+
> * Deploy a sample Azure vote app to an AKS cluster.
26+
> * Create a basic Jenkins project.
27+
> * Set up credentials for Jenkins to interact with ACR.
28+
> * Create a Jenkins build job and GitHub webhook for automated builds.
29+
> * Test the CI/CD pipeline to update an application in AKS based on GitHub code commits.
2330
24-
## Before you begin
31+
## Prerequisites
2532

26-
You need the following items in order to complete the steps in this article.
33+
To complete this tutorial, you need these items:
2734

2835
- Basic understanding of Kubernetes, Git, CI/CD, and container images
2936

30-
- An [AKS cluster][aks-quickstart] and `kubectl` configured with the [AKS cluster credentials][aks-credentials].
31-
- An [Azure Container Registry (ACR) registry][acr-quickstart], the ACR login server name, and the AKS cluster configured to [authenticate with the ACR registry][acr-authentication].
37+
- An [AKS cluster][aks-quickstart] and `kubectl` configured with the
38+
[AKS cluster credentials][aks-credentials]
39+
40+
- An [Azure Container Registry (ACR) registry][acr-quickstart],
41+
the ACR login server name, and the AKS cluster configured to
42+
[authenticate with the ACR registry][acr-authentication]
43+
44+
- The Azure CLI version 2.0.46 or later installed and configured.
45+
Run `az --version` to find the version. If you need to install or upgrade,
46+
see [Install Azure CLI][install-azure-cli].
47+
48+
- [Docker installed][docker-install] on your development system
3249

33-
- The Azure CLI version 2.0.46 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
34-
- [Docker installed][docker-install] on your development system.
35-
- A GitHub account, [GitHub personal access token][git-access-token], and Git client installed on your development system.
50+
- A GitHub account, [GitHub personal access token][git-access-token],
51+
and Git client installed on your development system
3652

37-
- If you provide your own Jenkins instance rather than this sample scripted way to deploy Jenkins, your Jenkins instance needs [Docker installed and configured][docker-install] and [kubectl][kubectl-install].
53+
- If you provide your own Jenkins instance rather
54+
than this sample scripted way to deploy Jenkins,
55+
your Jenkins instance needs [Docker installed and configured][docker-install]
56+
and [kubectl][kubectl-install].
3857

39-
## Prepare the application
58+
## Prepare your app
4059

4160
In this article, you use a sample Azure vote application that contains a web interface hosted in one or more pods, and a second pod hosting Redis for temporary data storage. Before you integrate Jenkins and AKS for automated deployments, first manually prepare and deploy the Azure vote application to your AKS cluster. This manual deployment is version one of the application, and lets you see the application in action.
4261

‎articles/cognitive-services/Translator/request-limits.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
title: Request limits - Translator Text API
3+
titleSuffix: Azure Cognitive Services
4+
description: This article lists request limits for the Translator Text API. Charges are incurred based on character count, not request frequency with a limit of 5,000 characters per request. Character limits are subscription based, with F0 limited to 2 million characters per hour.
5+
services: cognitive-services
6+
author: erhopf
7+
manager: cgronlun
8+
ms.service: cognitive-services
9+
ms.component: translator-text
10+
ms.topic: conceptual
11+
ms.date: 11/15/2018
12+
ms.author: erhopf
13+
---
14+
15+
# Request limits for Translator Text
16+
17+
This article provides throttling limits for the Translator Text API. Services include translation, transliteration, sentence length detection, language detection, and alternate translations.
18+
19+
## Character limits per request
20+
21+
Each request is limited to 5,000 characters. You're charged per character, not by the number of requests. It's recommended to send shorter requests, and to have some requests outstanding at any given time.
22+
23+
There's no limit on the number of outstanding requests to the Translator Text API.
24+
25+
## Character limits per hour
26+
27+
Your character limit per hour is based on your Translator Text subscription tier. If you reach or surpass these limits, you'll likely receive an out of quota response:
28+
29+
| Tier | Character limit |
30+
|------|-----------------|
31+
| F0 | 2 million characters per hour |
32+
| S1 | 40 million characters per hour |
33+
| S2 | 40 million characters per hour |
34+
| S3 | 120 million characters per hour |
35+
| S4 | 200 million characters per hour |
36+
37+
These limits are restricted to Microsoft's generic systems. Custom translation systems that use Microsoft's Translator Hub are limited to 1,800 character per second.
38+
39+
## Latency
40+
41+
Translator Text has a maximum latency of 13 seconds. By this time you'll have received a result or a timeout response. Typically, responses are returned in 150 milliseconds to 300 milliseconds. Response times will vary based on the size or the request and language pair.
42+
43+
## Sentence length limits
44+
45+
When using the [BreakSentence](https://docs.microsoft.com/azure/cognitive-services/translator/reference/v3-0-break-sentence) function, sentence length is limited to 275 characters. There are exceptions for these languages:
46+
47+
| Language | Code | Character limit |
48+
|----------|------|-----------------|
49+
| Chinese | zh | 132 |
50+
| German | de | 290 |
51+
| Italian | it | 280 |
52+
| Japanese | ja | 150 |
53+
| Portuguese | pt | 290 |
54+
| Spanish | es | 280 |
55+
| Italian | it | 280 |
56+
| Thai | th | 258 |
57+
58+
> [!NOTE]
59+
> This limit doesn't apply to translations.
60+
61+
## Next steps
62+
63+
* [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/translator-text-api/)
64+
* [Regional availability](https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services)
65+
* [v3 Translator Text API reference](https://docs.microsoft.com/azure/cognitive-services/translator/reference/v3-0-reference)

‎articles/cognitive-services/Translator/toc.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,12 @@
164164
href: https://cognitive.uservoice.com/knowledgebase/topics/132647-translator
165165
- name: Language and region support
166166
href: language-support.md
167-
- name: Pricing and limits
167+
- name: Pricing
168168
href: https://azure.microsoft.com/pricing/details/cognitive-services/translator-text-api/
169169
- name: Regional availability
170-
href: https://azure.microsoft.com/global-infrastructure/services/
170+
href: https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services
171+
- name: Request limits
172+
href: request-limits.md
171173
- name: Stack Overflow
172174
href: https://stackoverflow.com/questions/tagged/microsoft-translator
173175
- name: UserVoice

0 commit comments

Comments
 (0)